From ddd6cc7400e00586d52840deb0ec8df98f69de4a Mon Sep 17 00:00:00 2001
From: unknown
Date: Fri, 28 Mar 2014 12:49:02 +0100
Subject: -XML Creator eingebaut -Dateiname angepasst -> Uploader funktioniert
nun wieder
---
Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 10530 -> 11083 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'Dozentenmodul/bin/GUI/FTPUploader_GUI.class')
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
index 64da3d54..52709eee 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ
--
cgit v1.2.3-55-g7522
From dc5dc58cf6234889f72d52a150d1b934cbb326ec Mon Sep 17 00:00:00 2001
From: unknown
Date: Tue, 1 Apr 2014 14:12:17 +0200
Subject: Unterschiedliche kleine und größere Änderungen
---
Dozentenmodul/.classpath | 1 +
.../bin/GUI/EditImageAllgemein_GUI$1.class | Bin 716 -> 716 bytes
.../bin/GUI/EditImageAllgemein_GUI$2.class | Bin 793 -> 793 bytes
.../bin/GUI/EditImageAllgemein_GUI$3.class | Bin 833 -> 833 bytes
.../bin/GUI/EditImageAllgemein_GUI$4.class | Bin 1368 -> 1841 bytes
Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 8826 -> 9064 bytes
.../bin/GUI/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes
.../bin/GUI/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes
.../bin/GUI/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes
Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class | Bin 8389 -> 8401 bytes
.../bin/GUI/EingabeImageAllgemein_GUI$1.class | Bin 734 -> 979 bytes
.../bin/GUI/EingabeImageAllgemein_GUI$2.class | Bin 811 -> 811 bytes
.../bin/GUI/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 1125 bytes
.../bin/GUI/EingabeImageAllgemein_GUI$4.class | Bin 1586 -> 1602 bytes
.../bin/GUI/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7761 bytes
.../bin/GUI/EingabeImageTechnisch_GUI.class | Bin 8391 -> 8397 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 11083 -> 11740 bytes
Dozentenmodul/bin/GUI/Login_GUI$1.class | Bin 1082 -> 1082 bytes
Dozentenmodul/bin/GUI/Login_GUI$2.class | Bin 635 -> 635 bytes
Dozentenmodul/bin/GUI/Login_GUI$3.class | Bin 4427 -> 647 bytes
Dozentenmodul/bin/GUI/Login_GUI.class | Bin 3947 -> 7734 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI$1.class | Bin 662 -> 662 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI$2.class | Bin 729 -> 729 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI$3.class | Bin 740 -> 740 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI$4.class | Bin 1840 -> 996 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 8069 -> 10767 bytes
.../bin/gui/EditImageAllgemein_GUI$1.class | Bin 716 -> 716 bytes
.../bin/gui/EditImageAllgemein_GUI$2.class | Bin 793 -> 793 bytes
.../bin/gui/EditImageAllgemein_GUI$3.class | Bin 833 -> 833 bytes
.../bin/gui/EditImageAllgemein_GUI$4.class | Bin 1368 -> 1841 bytes
Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 8826 -> 9064 bytes
.../bin/gui/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes
.../bin/gui/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes
.../bin/gui/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes
Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class | Bin 8389 -> 8401 bytes
.../bin/gui/EingabeImageAllgemein_GUI$1.class | Bin 734 -> 979 bytes
.../bin/gui/EingabeImageAllgemein_GUI$2.class | Bin 0 -> 811 bytes
.../bin/gui/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 1125 bytes
.../bin/gui/EingabeImageAllgemein_GUI$4.class | Bin 0 -> 1602 bytes
.../bin/gui/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7761 bytes
.../bin/gui/EingabeImageTechnisch_GUI.class | Bin 8391 -> 8397 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 0 -> 1449 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 0 -> 1574 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$7.class | Bin 0 -> 793 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 11083 -> 11740 bytes
Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes
Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes
Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 4427 -> 647 bytes
Dozentenmodul/bin/gui/Login_GUI$4.class | Bin 0 -> 647 bytes
Dozentenmodul/bin/gui/Login_GUI$5.class | Bin 0 -> 644 bytes
Dozentenmodul/bin/gui/Login_GUI.class | Bin 3947 -> 7734 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$1.class | Bin 662 -> 662 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$10.class | Bin 0 -> 793 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$11.class | Bin 0 -> 1005 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$12.class | Bin 0 -> 1834 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$2.class | Bin 729 -> 729 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$3.class | Bin 740 -> 740 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$4.class | Bin 1840 -> 996 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$5.class | Bin 0 -> 976 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$6.class | Bin 0 -> 947 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$7.class | Bin 0 -> 1031 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$8.class | Bin 0 -> 973 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$9.class | Bin 0 -> 944 bytes
Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 8069 -> 10767 bytes
.../src/gui/EingabeImageTechnisch_GUI.java | 19 ++++++++++---------
74 files changed, 11 insertions(+), 9 deletions(-)
create mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class
create mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class
create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$5.class
create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$6.class
create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$7.class
create mode 100644 Dozentenmodul/bin/gui/Login_GUI$4.class
create mode 100644 Dozentenmodul/bin/gui/Login_GUI$5.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$10.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$11.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$12.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$5.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$6.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$7.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$8.class
create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$9.class
(limited to 'Dozentenmodul/bin/GUI/FTPUploader_GUI.class')
diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath
index d012956c..1e2dfca0 100644
--- a/Dozentenmodul/.classpath
+++ b/Dozentenmodul/.classpath
@@ -18,5 +18,6 @@
+
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
index 8aac918a..e01e6b79 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
index fe3aa20e..dc948767 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
index 04b61bfc..e248fd06 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
index 79d48c01..051431f2 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
index fe7cbc2f..c0a38325 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
index ce51d208..dcfd7111 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
index 4439a63d..a0a6173c 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
index ed1c7c14..f5d01268 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
index 9d2ce374..21658851 100644
Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class
index 929a1184..d6ce35c1 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class
index b87e4c2a..979638d5 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class
index 210e494d..a8301134 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class
index 69b2a2a7..fb0a74b7 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class
index ba01d472..af7cda76 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
index baa9e9f0..ecb1cb44 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
index ea94db00..7586f5de 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
index 9e658891..245043a2 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
index e8031c6b..c72d35c6 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
index 8a248b02..03012ec1 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
index 71928437..bd46a337 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
index 52709eee..ec900ffd 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class
index a0cfa528..b4388d57 100644
Binary files a/Dozentenmodul/bin/GUI/Login_GUI$1.class and b/Dozentenmodul/bin/GUI/Login_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class
index ff56145f..54cd4d69 100644
Binary files a/Dozentenmodul/bin/GUI/Login_GUI$2.class and b/Dozentenmodul/bin/GUI/Login_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class
index aad19364..46796de6 100644
Binary files a/Dozentenmodul/bin/GUI/Login_GUI$3.class and b/Dozentenmodul/bin/GUI/Login_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/Login_GUI.class b/Dozentenmodul/bin/GUI/Login_GUI.class
index c784876c..98c862f5 100644
Binary files a/Dozentenmodul/bin/GUI/Login_GUI.class and b/Dozentenmodul/bin/GUI/Login_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
index 58e4c435..57b08981 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
index 9bb444b5..77e0fbd6 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
index e2caddfd..6e35da4f 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
index 89820f94..556b11db 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index c08f45b9..b39b43af 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class
index 8aac918a..e01e6b79 100644
Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class
index fe3aa20e..dc948767 100644
Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class
index 04b61bfc..e248fd06 100644
Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class
index 79d48c01..051431f2 100644
Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class
index fe7cbc2f..c0a38325 100644
Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class
index ce51d208..dcfd7111 100644
Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class
index 4439a63d..a0a6173c 100644
Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class
index ed1c7c14..f5d01268 100644
Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class
index 9d2ce374..21658851 100644
Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class
index 929a1184..d6ce35c1 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class
new file mode 100644
index 00000000..979638d5
Binary files /dev/null and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class
index 210e494d..a8301134 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class
new file mode 100644
index 00000000..fb0a74b7
Binary files /dev/null and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class
index ba01d472..af7cda76 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class
index baa9e9f0..ecb1cb44 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class
index ea94db00..7586f5de 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class
index 9e658891..245043a2 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class
index e8031c6b..c72d35c6 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class
index 8a248b02..03012ec1 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class
new file mode 100644
index 00000000..bd46a337
Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class
new file mode 100644
index 00000000..0176a3a2
Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class
new file mode 100644
index 00000000..6597ecfb
Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class
index 52709eee..ec900ffd 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class
index a0cfa528..b4388d57 100644
Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class
index ff56145f..54cd4d69 100644
Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class
index aad19364..46796de6 100644
Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class
new file mode 100644
index 00000000..22908f76
Binary files /dev/null and b/Dozentenmodul/bin/gui/Login_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class
new file mode 100644
index 00000000..e1bf5be2
Binary files /dev/null and b/Dozentenmodul/bin/gui/Login_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class
index c784876c..98c862f5 100644
Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
index 58e4c435..57b08981 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class
new file mode 100644
index 00000000..d339898a
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class
new file mode 100644
index 00000000..1021e00c
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class
new file mode 100644
index 00000000..00f3522e
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class
index 9bb444b5..77e0fbd6 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class
index e2caddfd..6e35da4f 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
index 89820f94..556b11db 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class
new file mode 100644
index 00000000..953c5c22
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class
new file mode 100644
index 00000000..69b80c5f
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class
new file mode 100644
index 00000000..cb9cbe82
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class
new file mode 100644
index 00000000..fc114f01
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class
new file mode 100644
index 00000000..60491c0b
Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class
index c08f45b9..b39b43af 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/MainMenue_GUI.class differ
diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
index 62cfd19a..43482544 100644
--- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
@@ -249,8 +249,8 @@ public class EingabeImageTechnisch_GUI extends JFrame {
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
{
- JButton okButton = new JButton("Zur\u00FCck");
- okButton.addActionListener(new ActionListener() {
+ JButton cancelButton = new JButton("Zur\u00FCck");
+ cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if(rdbtnInternetJa.isSelected()==true)
@@ -278,13 +278,13 @@ public class EingabeImageTechnisch_GUI extends JFrame {
dispose();
}
});
- okButton.setActionCommand("OK");
- buttonPane.add(okButton);
- getRootPane().setDefaultButton(okButton);
+ cancelButton.setActionCommand("OK");
+ buttonPane.add(cancelButton);
+ //getRootPane().setDefaultButton(cancelButton);
}
{
- JButton cancelButton = new JButton("Weiter");
- cancelButton.addActionListener(new ActionListener() {
+ JButton continueButton = new JButton("Weiter");
+ continueButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if(rdbtnInternetJa.isSelected()==true)
{
@@ -311,8 +311,9 @@ public class EingabeImageTechnisch_GUI extends JFrame {
}
});
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
+ continueButton.setActionCommand("Cancel");
+ buttonPane.add(continueButton);
+ getRootPane().setDefaultButton(continueButton);
}
}
--
cgit v1.2.3-55-g7522
From 20730f37f213a07f990bcb928a9e23f871d49d29 Mon Sep 17 00:00:00 2001
From: unknown
Date: Wed, 2 Apr 2014 17:37:51 +0200
Subject: Diverse kleine Bugfixes
---
.../bin/GUI/EingabeImageTechnisch_GUI$2.class | Bin 811 -> 811 bytes
.../bin/GUI/EingabeImageTechnisch_GUI$3.class | Bin 1639 -> 1639 bytes
.../bin/GUI/EingabeImageTechnisch_GUI$4.class | Bin 1619 -> 1619 bytes
.../bin/GUI/EingabeImageTechnisch_GUI.class | Bin 8397 -> 8754 bytes
Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class | Bin 1266 -> 1266 bytes
Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class | Bin 1211 -> 1211 bytes
Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class | Bin 778 -> 778 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1312 -> 1564 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1449 -> 1633 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 11740 -> 11984 bytes
Dozentenmodul/bin/GUI/SearchImage_GUI$1.class | Bin 674 -> 674 bytes
Dozentenmodul/bin/GUI/SearchImage_GUI.class | Bin 11628 -> 11734 bytes
.../bin/gui/EingabeImageTechnisch_GUI$2.class | Bin 811 -> 811 bytes
.../bin/gui/EingabeImageTechnisch_GUI$3.class | Bin 1639 -> 1639 bytes
.../bin/gui/EingabeImageTechnisch_GUI$4.class | Bin 1619 -> 1619 bytes
.../bin/gui/EingabeImageTechnisch_GUI.class | Bin 8397 -> 8754 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1312 -> 1564 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 1449 -> 1633 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 1574 -> 1574 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$7.class | Bin 793 -> 793 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI$8.class | Bin 0 -> 814 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 11740 -> 11984 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$1.class | Bin 674 -> 674 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$2.class | Bin 1221 -> 1237 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$3.class | Bin 742 -> 742 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$4.class | Bin 1228 -> 1244 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$5.class | Bin 751 -> 751 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$6.class | Bin 1316 -> 1324 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$7.class | Bin 831 -> 831 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$8.class | Bin 793 -> 793 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$9.class | Bin 809 -> 809 bytes
Dozentenmodul/bin/gui/SearchImage_GUI.class | Bin 11628 -> 11734 bytes
Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 1581 -> 1590 bytes
.../src/GUI/EingabeImageTechnisch_GUI.java | 179 +++++++------
Dozentenmodul/src/GUI/FTPUploader_GUI.java | 93 ++++---
Dozentenmodul/src/GUI/SearchImage_GUI.java | 285 +++++++++++----------
.../src/gui/EingabeImageTechnisch_GUI.java | 179 +++++++------
Dozentenmodul/src/gui/FTPUploader_GUI.java | 93 ++++---
Dozentenmodul/src/gui/SearchImage_GUI.java | 285 +++++++++++----------
Dozentenmodul/src/thrift/ThriftConnection.java | 2 +-
.../bin/server/BinaryListener.class | Bin 2110 -> 2151 bytes
Dozentenmodulserver/bin/server/ServerHandler.class | Bin 9540 -> 9540 bytes
Dozentenmodulserver/bin/server/startServer.class | Bin 1609 -> 1889 bytes
Dozentenmodulserver/src/server/BinaryListener.java | 3 +-
Dozentenmodulserver/src/server/ServerHandler.java | 1 +
Dozentenmodulserver/src/server/startServer.java | 5 +-
48 files changed, 611 insertions(+), 514 deletions(-)
create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$8.class
(limited to 'Dozentenmodul/bin/GUI/FTPUploader_GUI.class')
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class
index b237ee04..9e20b5fa 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
index 2f3bc164..54767b1b 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
index 7237fa6b..284319c7 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
index ecb1cb44..2a2a0020 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
index 244b88e2..f8d1dc16 100644
Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
index 42a0f970..a98b364b 100644
Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
index 26910efa..3bffc15f 100644
Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
index c72d35c6..2422f25a 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
index 03012ec1..551a9ab9 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
index bd46a337..9f214076 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
index ec900ffd..b1d61364 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
index be572a32..3839b528 100644
Binary files a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class and b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
index c676d0a8..87386672 100644
Binary files a/Dozentenmodul/bin/GUI/SearchImage_GUI.class and b/Dozentenmodul/bin/GUI/SearchImage_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class
index b237ee04..9e20b5fa 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class
index 2f3bc164..54767b1b 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class
index 7237fa6b..284319c7 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class
index ecb1cb44..2a2a0020 100644
Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class
index c72d35c6..2422f25a 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class
index 03012ec1..551a9ab9 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class
index bd46a337..9f214076 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class
index 0176a3a2..a7c0b511 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class
index 6597ecfb..10890564 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class
new file mode 100644
index 00000000..07752dad
Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class
index ec900ffd..b1d61364 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchImage_GUI$1.class
index be572a32..3839b528 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchImage_GUI$2.class
index 3a6ee9ab..9b8efb38 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchImage_GUI$3.class
index 721116df..6317e30c 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchImage_GUI$4.class
index 33a3f111..8b38dc60 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchImage_GUI$5.class
index 6673eef5..a238b34c 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchImage_GUI$6.class
index 1863e40f..ae62d5aa 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class
index ef51173a..c68c74e6 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchImage_GUI$8.class
index 5e5bfeb5..e5e281b0 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$8.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class
index e231bdf7..28b5e4df 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI.class b/Dozentenmodul/bin/gui/SearchImage_GUI.class
index c676d0a8..87386672 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/SearchImage_GUI.class differ
diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class
index df283ea9..7f087cc1 100644
Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ
diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
index 9358f33d..f31f811d 100644
--- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
@@ -116,102 +116,71 @@ public class EingabeImageTechnisch_GUI extends JFrame {
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 66, 557, 95);
+ panel_1.setBounds(10, 66, 557, 124);
contentPanel.add(panel_1);
panel_1.setLayout(null);
- JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
- lblNewLabel_2.setBounds(10, 30, 250, 20);
- panel_1.add(lblNewLabel_2);
-
- rdbtnlicenseJa = new JRadioButton("Ja");
- rdbtnlicenseJa.setSelected(true);
- buttonGrouplicense.add(rdbtnlicenseJa);
- rdbtnlicenseJa.setBounds(266, 29, 109, 23);
- panel_1.add(rdbtnlicenseJa);
-
rdbtnlicenseNein = new JRadioButton("Nein");
buttonGrouplicense.add(rdbtnlicenseNein);
- rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+ rdbtnlicenseNein.setBounds(377, 29, 46, 23);
panel_1.add(rdbtnlicenseNein);
- JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+ rdbtnInternetNein = new JRadioButton("Nein");
+ rdbtnInternetNein.setSelected(true);
+ buttonGroupInternet.add(rdbtnInternetNein);
+ rdbtnInternetNein.setBounds(377, 57, 46, 23);
+ panel_1.add(rdbtnInternetNein);
+
+ JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
+ JButton btnInternetSettings = new JButton("Einstellungen...");
+ btnInternetSettings.setEnabled(false);
+ btnInternetSettings.setBounds(439, 57, 108, 23);
+ panel_1.add(btnInternetSettings);
+
rdbtnInternetJa = new JRadioButton("Ja");
+
buttonGroupInternet.add(rdbtnInternetJa);
- rdbtnInternetJa.setBounds(266, 57, 109, 23);
+ rdbtnInternetJa.setBounds(266, 57, 41, 23);
panel_1.add(rdbtnInternetJa);
- rdbtnInternetNein = new JRadioButton("Nein");
- rdbtnInternetNein.setSelected(true);
- buttonGroupInternet.add(rdbtnInternetNein);
- rdbtnInternetNein.setBounds(377, 57, 109, 23);
- panel_1.add(rdbtnInternetNein);
-
- JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
- lblHauptmen.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent arg0) {
-
- EingabeImageTechnisch_GUI.this.setVisible(false);
- MainMenue_GUI main=new MainMenue_GUI();
- main.setVisible(true);
- }
- });
- lblHauptmen.setForeground(Color.BLUE);
- lblHauptmen.setBounds(10, 11, 61, 14);
- contentPanel.add(lblHauptmen);
-
- JLabel label_1 = new JLabel(">");
- label_1.setBounds(69, 11, 13, 14);
- contentPanel.add(label_1);
+ rdbtnlicenseJa = new JRadioButton("Ja");
+ rdbtnlicenseJa.setSelected(true);
+ buttonGrouplicense.add(rdbtnlicenseJa);
+ rdbtnlicenseJa.setBounds(266, 29, 41, 23);
+ panel_1.add(rdbtnlicenseJa);
- JLabel lblVlimage = new JLabel("VL-Image");
- lblVlimage.setForeground(Color.BLUE);
- lblVlimage.setBounds(81, 11, 45, 14);
- contentPanel.add(lblVlimage);
+ JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+ lblNewLabel_2.setBounds(10, 30, 250, 20);
+ panel_1.add(lblNewLabel_2);
- JLabel label_2 = new JLabel(">");
- label_2.setBounds(133, 11, 13, 14);
- contentPanel.add(label_2);
+ JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
+ lblLizenzserverEintragen.setBounds(10, 85, 250, 20);
+ panel_1.add(lblLizenzserverEintragen);
- JLabel lblNewLabel_1 = new JLabel("Neu");
- lblNewLabel_1.setBounds(146, 11, 46, 14);
- contentPanel.add(lblNewLabel_1);
+ JButton btnLicenseServer = new JButton("Server-Adresse...");
+ btnLicenseServer.setEnabled(false);
+ btnLicenseServer.setBounds(266, 84, 157, 23);
+ panel_1.add(btnLicenseServer);
JPanel panel_2 = new JPanel();
panel_2.setLayout(null);
panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_2.setBackground(SystemColor.menu);
- panel_2.setBounds(10, 172, 557, 338);
+ panel_2.setBounds(11, 196, 557, 338);
contentPanel.add(panel_2);
- JTextArea txtrHinweisSolltenSie = new JTextArea();
- txtrHinweisSolltenSie.setBackground(SystemColor.menu);
- txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
- txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
- txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
- panel_2.add(txtrHinweisSolltenSie);
-
- JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
- lblNewLabel_3.setBounds(10, 91, 280, 20);
- panel_2.add(lblNewLabel_3);
-
- JLabel lblMindestens = new JLabel("mindestens");
- lblMindestens.setBounds(315, 91, 60, 20);
- panel_2.add(lblMindestens);
-
- spinnerRam = new JSpinner();
- spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
- spinnerRam.setBounds(385, 88, 29, 20);
- panel_2.add(spinnerRam);
-
JLabel lblGbyte = new JLabel("GByte");
lblGbyte.setBounds(424, 91, 46, 20);
panel_2.add(lblGbyte);
+ spinnerCPU = new JSpinner();
+ spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
+ spinnerCPU.setBounds(385, 188, 29, 20);
+ panel_2.add(spinnerCPU);
+
JTextArea txtrBeispielWindows = new JTextArea();
txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte");
txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
@@ -219,29 +188,77 @@ public class EingabeImageTechnisch_GUI extends JFrame {
txtrBeispielWindows.setBounds(10, 122, 280, 55);
panel_2.add(txtrBeispielWindows);
- JTextArea txtrBeispielWindows_1 = new JTextArea();
- txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
- txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
- txtrBeispielWindows_1.setBackground(SystemColor.menu);
- txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
- panel_2.add(txtrBeispielWindows_1);
+
+
+ JLabel lblKerne = new JLabel("Kerne");
+ lblKerne.setBounds(424, 191, 46, 20);
+ panel_2.add(lblKerne);
JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
lblWieVieleCpus.setBounds(10, 191, 280, 20);
panel_2.add(lblWieVieleCpus);
+ spinnerRam = new JSpinner();
+ spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
+ spinnerRam.setBounds(385, 88, 29, 20);
+ panel_2.add(spinnerRam);
+
JLabel label_3 = new JLabel("mindestens");
label_3.setBounds(315, 191, 60, 20);
panel_2.add(label_3);
- spinnerCPU = new JSpinner();
- spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
- spinnerCPU.setBounds(385, 188, 29, 20);
- panel_2.add(spinnerCPU);
+ JLabel lblMindestens = new JLabel("mindestens");
+ lblMindestens.setBounds(315, 91, 60, 20);
+ panel_2.add(lblMindestens);
- JLabel lblKerne = new JLabel("Kerne");
- lblKerne.setBounds(424, 191, 46, 20);
- panel_2.add(lblKerne);
+ JTextArea txtrBeispielWindows_1 = new JTextArea();
+ txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
+ txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+ txtrBeispielWindows_1.setBackground(SystemColor.menu);
+ txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
+ panel_2.add(txtrBeispielWindows_1);
+
+ JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+ lblNewLabel_3.setBounds(10, 91, 280, 20);
+ panel_2.add(lblNewLabel_3);
+
+ JTextArea txtrHinweisSolltenSie = new JTextArea();
+ txtrHinweisSolltenSie.setBackground(SystemColor.menu);
+ txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
+ txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+ txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
+ panel_2.add(txtrHinweisSolltenSie);
+
+ JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+ lblHauptmen.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+
+ EingabeImageTechnisch_GUI.this.setVisible(false);
+ MainMenue_GUI main=new MainMenue_GUI();
+ main.setVisible(true);
+ }
+ });
+ lblHauptmen.setForeground(Color.BLUE);
+ lblHauptmen.setBounds(10, 11, 61, 14);
+ contentPanel.add(lblHauptmen);
+
+ JLabel label_1 = new JLabel(">");
+ label_1.setBounds(69, 11, 13, 14);
+ contentPanel.add(label_1);
+
+ JLabel lblVlimage = new JLabel("VL-Image");
+ lblVlimage.setForeground(Color.BLUE);
+ lblVlimage.setBounds(81, 11, 45, 14);
+ contentPanel.add(lblVlimage);
+
+ JLabel label_2 = new JLabel(">");
+ label_2.setBounds(133, 11, 13, 14);
+ contentPanel.add(label_2);
+
+ JLabel lblNewLabel_1 = new JLabel("Neu");
+ lblNewLabel_1.setBounds(146, 11, 46, 14);
+ contentPanel.add(lblNewLabel_1);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index 25fd436f..f435f3ff 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -128,31 +128,38 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(null);
{
- JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
+ JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
JFileChooser fc = new JFileChooser();
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.showOpenDialog(getParent());
- File dir = fc.getSelectedFile();
- uploadFile = dir;
- filename = uploadFile.getName();
- lblNewLabel.setText(dir.getAbsolutePath());
+ File file = fc.getSelectedFile();
+ //check if a file is selected and exists
+ if (file != null) {
+ System.out.println("File to upload exists");
+ uploadFile = file;
+ filename = uploadFile.getName();
+ lblNewLabel.setText(file.getAbsolutePath());
+ } else {
+ System.out.println("No file selected");
+ lblNewLabel.setText("");
+ }//end if
}
});
- btnSpeicherortAuswhlen.setBounds(57, 124, 117, 23);
+ btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
- btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
contentPanel.add(btnSpeicherortAuswhlen);
}
lblNewLabel = new JLabel("");
- lblNewLabel.setBounds(191, 124, 255, 23);
+ lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
+ lblNewLabel.setBounds(285, 124, 302, 23);
contentPanel.add(lblNewLabel);
- JButton btnUploadStarten = new JButton("Upload starten");
+ JButton btnUploadStarten = new JButton("Upload auf Server starten");
btnUploadStarten.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
buttonUploadActionPerformed(arg0);
@@ -160,53 +167,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
});
- btnUploadStarten.setBounds(57, 168, 141, 23);
+ btnUploadStarten.setBounds(102, 168, 173, 23);
contentPanel.add(btnUploadStarten);
progressBar = new JProgressBar(0, 100);
progressBar.setStringPainted(true);
- progressBar.setBounds(57, 202, 497, 30);
+ progressBar.setBounds(102, 202, 485, 30);
contentPanel.add(progressBar);
JLabel label = new JLabel("Downloadgeschwindigkeit:");
- label.setBounds(57, 243, 141, 14);
+ label.setBounds(102, 243, 141, 14);
contentPanel.add(label);
JLabel label_1 = new JLabel("Fertig:");
- label_1.setBounds(57, 293, 46, 14);
+ label_1.setBounds(102, 293, 46, 14);
contentPanel.add(label_1);
labelfertig = new JLabel("0");
- labelfertig.setBounds(113, 293, 71, 14);
+ labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfertig.setBounds(183, 293, 108, 14);
contentPanel.add(labelfertig);
UpSpeed = new JLabel("0");
- UpSpeed.setBounds(329, 243, 95, 14);
+ UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
+ UpSpeed.setBounds(374, 243, 117, 14);
contentPanel.add(UpSpeed);
JLabel label_4 = new JLabel("von:");
- label_4.setBounds(184, 293, 46, 14);
+ label_4.setBounds(318, 293, 46, 14);
contentPanel.add(label_4);
labelfilesize = new JLabel("0");
- labelfilesize.setBounds(240, 293, 108, 14);
+ labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfilesize.setBounds(374, 293, 117, 14);
contentPanel.add(labelfilesize);
JLabel label_6 = new JLabel("Verbleibend:");
- label_6.setBounds(57, 318, 71, 14);
+ label_6.setBounds(102, 318, 71, 14);
contentPanel.add(label_6);
JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
- label_7.setBounds(57, 268, 150, 14);
+ label_7.setBounds(102, 268, 150, 14);
contentPanel.add(label_7);
labelZeit = new JLabel("0");
- labelZeit.setBounds(329, 268, 117, 14);
+ labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
+ labelZeit.setBounds(374, 268, 117, 14);
contentPanel.add(labelZeit);
labelverbleibend = new JLabel("0");
- labelverbleibend.setBounds(138, 318, 108, 14);
+ labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
+ labelverbleibend.setBounds(183, 318, 108, 14);
contentPanel.add(labelverbleibend);
JPanel panel = new JPanel();
@@ -221,7 +233,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
panel.add(lblUploadIhresImage);
JTextPane txtpnFhreSieBitte = new JTextPane();
- txtpnFhreSieBitte.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
+ txtpnFhreSieBitte
+ .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
txtpnFhreSieBitte.setEditable(false);
txtpnFhreSieBitte.setBackground(SystemColor.menu);
txtpnFhreSieBitte.setBounds(10, 36, 509, 32);
@@ -261,6 +274,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
btnCopyFileTo.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
+ System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName());
client.startFileCopy(user.path + "/" + uploadFile.getName());
} catch (TException e1) {
// TODO Auto-generated catch block
@@ -268,24 +282,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
}
});
- btnCopyFileTo.setBounds(57, 343, 217, 23);
+ btnCopyFileTo.setBounds(102, 343, 173, 23);
contentPanel.add(btnCopyFileTo);
- JLabel label_8 = new JLabel("1.");
- label_8.setBounds(24, 128, 23, 14);
- contentPanel.add(label_8);
+ JLabel lblShritt = new JLabel("Schritt 1:");
+ lblShritt.setBounds(24, 128, 57, 14);
+ contentPanel.add(lblShritt);
- JLabel label_9 = new JLabel("2.");
- label_9.setBounds(24, 172, 23, 14);
- contentPanel.add(label_9);
+ JLabel lblSchritt = new JLabel("Schritt 2:");
+ lblSchritt.setBounds(24, 172, 57, 14);
+ contentPanel.add(lblSchritt);
- JLabel label_10 = new JLabel("3.");
- label_10.setBounds(20, 391, 23, 14);
- contentPanel.add(label_10);
+ JLabel lblSchritt_1 = new JLabel("Schritt 3:");
+ lblSchritt_1.setBounds(20, 391, 57, 14);
+ contentPanel.add(lblSchritt_1);
JLabel lblKlickenSieAuf = new JLabel(
"Klicken Sie auf \"Fertigstellen\".");
- lblKlickenSieAuf.setBounds(53, 391, 241, 14);
+ lblKlickenSieAuf.setBounds(98, 391, 241, 14);
contentPanel.add(lblKlickenSieAuf);
{
JPanel buttonPane = new JPanel();
@@ -326,6 +340,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
});
+ JButton btnZurck = new JButton("Zur\u00FCck");
+ btnZurck.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();
+ m.setVisible(true);
+ }
+ });
+ btnZurck.setActionCommand("Cancel");
+ buttonPane.add(btnZurck);
+
cancelButton.setActionCommand("Cancel");
buttonPane.add(cancelButton);
finishButton.setActionCommand("Cancel");
@@ -400,7 +425,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
progress = (Integer) arg0.getNewValue();
progressBar.setValue(progress);
- // Button zum Fertigstellen freischalten
+ // Button zum Fertigstellen freischalten, wenn 100% erreicht sind
if (progress == 100) {
finishButton.setEnabled(true);
}
diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
index 4225a295..ee7727c3 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -1,6 +1,5 @@
package gui;
-
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -34,6 +33,7 @@ import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
import javax.swing.RowFilter;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -62,14 +62,17 @@ public class SearchImage_GUI extends JFrame {
JTable tablemyImages;
private JTextField textFieldName;
JTabbedPane tabbedPane;
- String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
- ThriftConnection con=new ThriftConnection();
- Client client=con.getThriftConnection();
- final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
- final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 );
- final TableRowSorter rowSorterAll = new TableRowSorter( modelAll );
- final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages );
-
+ String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+ "Verantwortlicher", "Letztes Update", "Schlagwort" };
+ ThriftConnection con = new ThriftConnection();
+ Client client = con.getThriftConnection();
+ final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+ final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
+ final TableRowSorter rowSorterAll = new TableRowSorter(
+ modelAll);
+ final TableRowSorter rowSorterMyImages = new TableRowSorter(
+ modelMyImages);
+
/**
* Launch the application.
*/
@@ -90,34 +93,31 @@ public class SearchImage_GUI extends JFrame {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent arg0) {
- //Beendet die Anwendung nach klick auf X
+ // Beendet die Anwendung nach klick auf X
System.exit(0);
}
});
- //Verhindert das Vergrößern Des Fensters
+ // Verhindert das Vergrößern Des Fensters
setResizable(false);
-
+
try {
- //Setzt das Look & Feel auf System
+ // Setzt das Look & Feel auf System
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- //Setzt den Fenstertitel
+ // Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp*");
- //Zentriert das Fenster in die Bildmitte
+ // Zentriert das Fenster in die Bildmitte
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
+ int top = (screenSize.height - 722) / 2;
+ int left = (screenSize.width - 603) / 2;
setBounds(left, top, 603, 722);
-
-
- final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-
-
+ final DefaultTableModel model = new DefaultTableModel(titles, 0);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
@@ -131,11 +131,12 @@ public class SearchImage_GUI extends JFrame {
panel.add(lblNewLabel);
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
}
-
+
JTextPane txtpnBitteWhlenSie = new JTextPane();
txtpnBitteWhlenSie.setEditable(false);
txtpnBitteWhlenSie.setBackground(SystemColor.menu);
- txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+ txtpnBitteWhlenSie
+ .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
panel.add(txtpnBitteWhlenSie);
}
@@ -144,144 +145,145 @@ public class SearchImage_GUI extends JFrame {
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
-
+
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
- panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
+ TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_1.setBounds(10, 49, 557, 131);
contentPanel.add(panel_1);
panel_1.setLayout(null);
-
+
JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
lblNewLabel_2.setBounds(10, 30, 250, 20);
panel_1.add(lblNewLabel_2);
-
+
JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
-
+
textFieldName = new JTextField();
- //Key Listener der Tastatureingabe registriert
+ // Key Listener der Tastatureingabe registriert
textFieldName.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
- //Textfield eingabe auslesen
- String stext=textFieldName.getText();
-
- //Wenn Textfield nicht leer
- if(stext!="")
- {
- //Filtere nach der Eingabe
- rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-
- }
- }});
+ // Textfield eingabe auslesen
+ String stext = textFieldName.getText();
+
+ // Wenn Textfield nicht leer
+ if (stext != "") {
+ // Filtere nach der Eingabe
+ rowSorterAll.setRowFilter(RowFilter.regexFilter(
+ textFieldName.getText(), 0));
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+ textFieldName.getText(), 0));
+ }
+ }
+ });
textFieldName.setBounds(270, 30, 250, 20);
panel_1.add(textFieldName);
textFieldName.setColumns(10);
-
- JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche");
+
+ JLabel lblErweiterteSuche = new JLabel(
+ "Erweiterte Suche");
lblErweiterteSuche.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- //Öffnet das Fenster Extended GUI
- ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+ // Öffnet das Fenster Extended GUI
+ ExtendedSearch_GUI es = new ExtendedSearch_GUI();
es.setVisible(true);
}
});
lblErweiterteSuche.setForeground(Color.BLUE);
-
+
lblErweiterteSuche.setBounds(431, 106, 89, 14);
panel_1.add(lblErweiterteSuche);
-
+
comboBox = new JComboBox();
try {
- //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
- List list=client.getAllOS();
- //Leeres Item hinzufügen
+ // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
+ List list = client.getAllOS();
+ // Leeres Item hinzufügen
comboBox.addItem("");
- for(int i=0;i");
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
-
+
JLabel lblVlimage = new JLabel("VL-Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
-
+
JLabel label_2 = new JLabel(">");
label_2.setBounds(133, 11, 13, 14);
contentPanel.add(label_2);
-
+
JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
lblNewLabel_1.setBounds(146, 11, 85, 14);
contentPanel.add(lblNewLabel_1);
-
+
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
tabbedPane.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent arg0) {
System.out.println(tabbedPane.getSelectedIndex());
- if(tabbedPane.getSelectedIndex()==0){
-
-
-
- }
- else if(tabbedPane.getSelectedIndex()==1){
- String username="Spitzer Tobias";
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
- //rowSorterMyImages.toggleSortOrder(0);
+ if (tabbedPane.getSelectedIndex() == 0) {
+
+ } else if (tabbedPane.getSelectedIndex() == 1) {
+ String username = "Spitzer Tobias";
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+ username, 4));
+ // rowSorterMyImages.toggleSortOrder(0);
}
-
+
}
});
tabbedPane.setBounds(10, 197, 557, 300);
contentPanel.add(tabbedPane);
-
+
JScrollPane scrollPaneMyImage = new JScrollPane();
- tablemyImages=new JTable();
+ tablemyImages = new JTable();
tablemyImages.setModel(modelMyImages);
tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -290,9 +292,9 @@ public class SearchImage_GUI extends JFrame {
tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
initTableModel(modelMyImages);
tablemyImages.setRowSorter(rowSorterMyImages);
-
+
JScrollPane scrollPaneAllImages = new JScrollPane();
- tableAllImages=new JTable();
+ tableAllImages = new JTable();
tableAllImages.setModel(modelAll);
tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -301,15 +303,15 @@ public class SearchImage_GUI extends JFrame {
tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
initTableModel(modelAll);
tableAllImages.setRowSorter(rowSorterAll);
-
- scrollPaneAllImages.setViewportView(tableAllImages);
- tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
+ 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();
+ JTable tableCoopImages = new JTable();
tableCoopImages.setModel(model);
tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -318,11 +320,12 @@ public class SearchImage_GUI extends JFrame {
tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPaneCoopImages.setViewportView(tableCoopImages);
- tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
+ tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
+ null);
tabbedPane.setEnabledAt(2, false);
-
+
JScrollPane scrollPanePublicImages = new JScrollPane();
- JTable tablePublicImages=new JTable();
+ JTable tablePublicImages = new JTable();
tablePublicImages.setModel(model);
tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -331,11 +334,12 @@ public class SearchImage_GUI extends JFrame {
tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPanePublicImages.setViewportView(tablePublicImages);
- tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
+ tabbedPane.addTab("\u00D6ffentliche Images", null,
+ scrollPanePublicImages, null);
tabbedPane.setEnabledAt(3, false);
-
+
JScrollPane scrollPanePublicVorlagen = new JScrollPane();
- JTable tablePublicVorlagen=new JTable();
+ JTable tablePublicVorlagen = new JTable();
tablePublicVorlagen.setModel(model);
tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -344,17 +348,15 @@ public class SearchImage_GUI extends JFrame {
tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
- tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
+ tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
+ scrollPanePublicVorlagen, null);
tabbedPane.setEnabledAt(4, false);
-
-
-
JButton btnDownload = new JButton("Download");
btnDownload.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- //Öffnet den Downloader
- FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+ // Öffnet den Downloader
+ FTPDownloader_GUI down = new FTPDownloader_GUI("Test");
down.setVisible(true);
SearchImage_GUI.this.setVisible(false);
}
@@ -368,78 +370,83 @@ public class SearchImage_GUI extends JFrame {
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
{
- JButton okButton = new JButton("Zur\u00FCck");
- okButton.addActionListener(new ActionListener() {
+ JButton cancelButton = new JButton("Zur\u00FCck");
+ cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- //Öffnet das Hauptmenü
- MainMenue_GUI main=new MainMenue_GUI();
+ // Öffnet das Hauptmenü
+ MainMenue_GUI main = new MainMenue_GUI();
main.setVisible(true);
dispose();
}
});
- okButton.setActionCommand("OK");
- buttonPane.add(okButton);
- getRootPane().setDefaultButton(okButton);
+ cancelButton.setActionCommand("OK");
+ buttonPane.add(cancelButton);
+ getRootPane().setDefaultButton(cancelButton);
}
{
- JButton cancelButton = new JButton("Weiter");
- cancelButton.addActionListener(new ActionListener() {
+ JButton continueButton = new JButton("Weiter");
+ continueButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
+ EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
ea.setVisible(true);
dispose();
-
+
}
});
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
+ continueButton.setActionCommand("Cancel");
+ buttonPane.add(continueButton);
}
}
-
+
JSeparator separator = new JSeparator();
separator.setBounds(0, 78, 597, 2);
getContentPane().add(separator);
-
+
JSeparator separator_1 = new JSeparator();
separator_1.setBounds(0, 627, 597, 2);
getContentPane().add(separator_1);
-
+
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
-
+
JMenuItem mntmFaq = new JMenuItem("FAQ");
mnNewMenu_1.add(mntmFaq);
-
+
JMenuItem mntmOtrs = new JMenuItem("OTRS");
mnNewMenu_1.add(mntmOtrs);
-
+
}
- //Initiale Beffülung eines Table models
- public DefaultTableModel initTableModel(DefaultTableModel model){
+
+ // Initiale Beffülung eines Table models
+ public DefaultTableModel initTableModel(DefaultTableModel model) {
List images;
try {
- //Hole eine Liste der Images
-
+ // Hole eine Liste der Images
+
images = client.getImageList();
- Iterator i=images.iterator();
-
- int x=0;
-
- while(i.hasNext())
- {
- //erzeuge Objekte für die Tabelle
- Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()};
- //Füge diese Objekte der Tabelle hinzu
+ Iterator i = images.iterator();
+
+ int x = 0;
+
+ while (i.hasNext()) {
+ // erzeuge Objekte für die Tabelle
+ Object[] obj = { images.get(x).getImageName(),
+ images.get(x).getLicenseRestriction(),
+ images.get(x).getOsName(),
+ images.get(x).getLectureName(),
+ images.get(x).getUserData(),
+ images.get(x).getUpdateTime() };
+ // Füge diese Objekte der Tabelle hinzu
model.addRow(obj);
x++;
i.next();
-
+
}
-
+
return model;
} catch (TException e1) {
// TODO Auto-generated catch block
@@ -447,7 +454,5 @@ public class SearchImage_GUI extends JFrame {
}
return model;
}
-
- }
-
+}
diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
index 43482544..7c26ca23 100644
--- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
@@ -116,102 +116,71 @@ public class EingabeImageTechnisch_GUI extends JFrame {
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 66, 557, 95);
+ panel_1.setBounds(10, 66, 557, 124);
contentPanel.add(panel_1);
panel_1.setLayout(null);
- JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
- lblNewLabel_2.setBounds(10, 30, 250, 20);
- panel_1.add(lblNewLabel_2);
-
- rdbtnlicenseJa = new JRadioButton("Ja");
- rdbtnlicenseJa.setSelected(true);
- buttonGrouplicense.add(rdbtnlicenseJa);
- rdbtnlicenseJa.setBounds(266, 29, 109, 23);
- panel_1.add(rdbtnlicenseJa);
-
rdbtnlicenseNein = new JRadioButton("Nein");
buttonGrouplicense.add(rdbtnlicenseNein);
- rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+ rdbtnlicenseNein.setBounds(377, 29, 46, 23);
panel_1.add(rdbtnlicenseNein);
- JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+ rdbtnInternetNein = new JRadioButton("Nein");
+ rdbtnInternetNein.setSelected(true);
+ buttonGroupInternet.add(rdbtnInternetNein);
+ rdbtnInternetNein.setBounds(377, 57, 46, 23);
+ panel_1.add(rdbtnInternetNein);
+
+ JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
+ JButton btnInternetSettings = new JButton("Einstellungen...");
+ btnInternetSettings.setEnabled(false);
+ btnInternetSettings.setBounds(439, 57, 108, 23);
+ panel_1.add(btnInternetSettings);
+
rdbtnInternetJa = new JRadioButton("Ja");
+
buttonGroupInternet.add(rdbtnInternetJa);
- rdbtnInternetJa.setBounds(266, 57, 109, 23);
+ rdbtnInternetJa.setBounds(266, 57, 41, 23);
panel_1.add(rdbtnInternetJa);
- rdbtnInternetNein = new JRadioButton("Nein");
- rdbtnInternetNein.setSelected(true);
- buttonGroupInternet.add(rdbtnInternetNein);
- rdbtnInternetNein.setBounds(377, 57, 109, 23);
- panel_1.add(rdbtnInternetNein);
-
- JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
- lblHauptmen.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent arg0) {
-
- EingabeImageTechnisch_GUI.this.setVisible(false);
- MainMenue_GUI main=new MainMenue_GUI();
- main.setVisible(true);
- }
- });
- lblHauptmen.setForeground(Color.BLUE);
- lblHauptmen.setBounds(10, 11, 61, 14);
- contentPanel.add(lblHauptmen);
-
- JLabel label_1 = new JLabel(">");
- label_1.setBounds(69, 11, 13, 14);
- contentPanel.add(label_1);
+ rdbtnlicenseJa = new JRadioButton("Ja");
+ rdbtnlicenseJa.setSelected(true);
+ buttonGrouplicense.add(rdbtnlicenseJa);
+ rdbtnlicenseJa.setBounds(266, 29, 41, 23);
+ panel_1.add(rdbtnlicenseJa);
- JLabel lblVlimage = new JLabel("VL-Image");
- lblVlimage.setForeground(Color.BLUE);
- lblVlimage.setBounds(81, 11, 45, 14);
- contentPanel.add(lblVlimage);
+ JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+ lblNewLabel_2.setBounds(10, 30, 250, 20);
+ panel_1.add(lblNewLabel_2);
- JLabel label_2 = new JLabel(">");
- label_2.setBounds(133, 11, 13, 14);
- contentPanel.add(label_2);
+ JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
+ lblLizenzserverEintragen.setBounds(10, 85, 250, 20);
+ panel_1.add(lblLizenzserverEintragen);
- JLabel lblNewLabel_1 = new JLabel("Neu");
- lblNewLabel_1.setBounds(146, 11, 46, 14);
- contentPanel.add(lblNewLabel_1);
+ JButton btnLicenseServer = new JButton("Server-Adresse...");
+ btnLicenseServer.setEnabled(false);
+ btnLicenseServer.setBounds(266, 84, 157, 23);
+ panel_1.add(btnLicenseServer);
JPanel panel_2 = new JPanel();
panel_2.setLayout(null);
panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_2.setBackground(SystemColor.menu);
- panel_2.setBounds(10, 172, 557, 338);
+ panel_2.setBounds(11, 196, 557, 338);
contentPanel.add(panel_2);
- JTextArea txtrHinweisSolltenSie = new JTextArea();
- txtrHinweisSolltenSie.setBackground(SystemColor.menu);
- txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
- txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
- txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
- panel_2.add(txtrHinweisSolltenSie);
-
- JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
- lblNewLabel_3.setBounds(10, 91, 280, 20);
- panel_2.add(lblNewLabel_3);
-
- JLabel lblMindestens = new JLabel("mindestens");
- lblMindestens.setBounds(315, 91, 60, 20);
- panel_2.add(lblMindestens);
-
- spinnerRam = new JSpinner();
- spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
- spinnerRam.setBounds(385, 88, 29, 20);
- panel_2.add(spinnerRam);
-
JLabel lblGbyte = new JLabel("GByte");
lblGbyte.setBounds(424, 91, 46, 20);
panel_2.add(lblGbyte);
+ spinnerCPU = new JSpinner();
+ spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
+ spinnerCPU.setBounds(385, 188, 29, 20);
+ panel_2.add(spinnerCPU);
+
JTextArea txtrBeispielWindows = new JTextArea();
txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte");
txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
@@ -219,29 +188,77 @@ public class EingabeImageTechnisch_GUI extends JFrame {
txtrBeispielWindows.setBounds(10, 122, 280, 55);
panel_2.add(txtrBeispielWindows);
- JTextArea txtrBeispielWindows_1 = new JTextArea();
- txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
- txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
- txtrBeispielWindows_1.setBackground(SystemColor.menu);
- txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
- panel_2.add(txtrBeispielWindows_1);
+
+
+ JLabel lblKerne = new JLabel("Kerne");
+ lblKerne.setBounds(424, 191, 46, 20);
+ panel_2.add(lblKerne);
JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
lblWieVieleCpus.setBounds(10, 191, 280, 20);
panel_2.add(lblWieVieleCpus);
+ spinnerRam = new JSpinner();
+ spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
+ spinnerRam.setBounds(385, 88, 29, 20);
+ panel_2.add(spinnerRam);
+
JLabel label_3 = new JLabel("mindestens");
label_3.setBounds(315, 191, 60, 20);
panel_2.add(label_3);
- spinnerCPU = new JSpinner();
- spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
- spinnerCPU.setBounds(385, 188, 29, 20);
- panel_2.add(spinnerCPU);
+ JLabel lblMindestens = new JLabel("mindestens");
+ lblMindestens.setBounds(315, 91, 60, 20);
+ panel_2.add(lblMindestens);
- JLabel lblKerne = new JLabel("Kerne");
- lblKerne.setBounds(424, 191, 46, 20);
- panel_2.add(lblKerne);
+ JTextArea txtrBeispielWindows_1 = new JTextArea();
+ txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
+ txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+ txtrBeispielWindows_1.setBackground(SystemColor.menu);
+ txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
+ panel_2.add(txtrBeispielWindows_1);
+
+ JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+ lblNewLabel_3.setBounds(10, 91, 280, 20);
+ panel_2.add(lblNewLabel_3);
+
+ JTextArea txtrHinweisSolltenSie = new JTextArea();
+ txtrHinweisSolltenSie.setBackground(SystemColor.menu);
+ txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
+ txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+ txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
+ panel_2.add(txtrHinweisSolltenSie);
+
+ JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+ lblHauptmen.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+
+ EingabeImageTechnisch_GUI.this.setVisible(false);
+ MainMenue_GUI main=new MainMenue_GUI();
+ main.setVisible(true);
+ }
+ });
+ lblHauptmen.setForeground(Color.BLUE);
+ lblHauptmen.setBounds(10, 11, 61, 14);
+ contentPanel.add(lblHauptmen);
+
+ JLabel label_1 = new JLabel(">");
+ label_1.setBounds(69, 11, 13, 14);
+ contentPanel.add(label_1);
+
+ JLabel lblVlimage = new JLabel("VL-Image");
+ lblVlimage.setForeground(Color.BLUE);
+ lblVlimage.setBounds(81, 11, 45, 14);
+ contentPanel.add(lblVlimage);
+
+ JLabel label_2 = new JLabel(">");
+ label_2.setBounds(133, 11, 13, 14);
+ contentPanel.add(label_2);
+
+ JLabel lblNewLabel_1 = new JLabel("Neu");
+ lblNewLabel_1.setBounds(146, 11, 46, 14);
+ contentPanel.add(lblNewLabel_1);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java
index 14cb40f5..2b5badd7 100644
--- a/Dozentenmodul/src/gui/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPUploader_GUI.java
@@ -128,31 +128,38 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(null);
{
- JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
+ JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
JFileChooser fc = new JFileChooser();
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.showOpenDialog(getParent());
- File dir = fc.getSelectedFile();
- uploadFile = dir;
- filename = uploadFile.getName();
- lblNewLabel.setText(dir.getAbsolutePath());
+ File file = fc.getSelectedFile();
+ //check if a file is selected and exists
+ if (file != null) {
+ System.out.println("File to upload exists");
+ uploadFile = file;
+ filename = uploadFile.getName();
+ lblNewLabel.setText(file.getAbsolutePath());
+ } else {
+ System.out.println("No file selected");
+ lblNewLabel.setText("");
+ }//end if
}
});
- btnSpeicherortAuswhlen.setBounds(57, 124, 117, 23);
+ btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
- btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
contentPanel.add(btnSpeicherortAuswhlen);
}
lblNewLabel = new JLabel("");
- lblNewLabel.setBounds(191, 124, 255, 23);
+ lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
+ lblNewLabel.setBounds(285, 124, 302, 23);
contentPanel.add(lblNewLabel);
- JButton btnUploadStarten = new JButton("Upload starten");
+ JButton btnUploadStarten = new JButton("Upload auf Server starten");
btnUploadStarten.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
buttonUploadActionPerformed(arg0);
@@ -160,53 +167,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
});
- btnUploadStarten.setBounds(57, 168, 141, 23);
+ btnUploadStarten.setBounds(102, 168, 173, 23);
contentPanel.add(btnUploadStarten);
progressBar = new JProgressBar(0, 100);
progressBar.setStringPainted(true);
- progressBar.setBounds(57, 202, 497, 30);
+ progressBar.setBounds(102, 202, 485, 30);
contentPanel.add(progressBar);
JLabel label = new JLabel("Downloadgeschwindigkeit:");
- label.setBounds(57, 243, 141, 14);
+ label.setBounds(102, 243, 141, 14);
contentPanel.add(label);
JLabel label_1 = new JLabel("Fertig:");
- label_1.setBounds(57, 293, 46, 14);
+ label_1.setBounds(102, 293, 46, 14);
contentPanel.add(label_1);
labelfertig = new JLabel("0");
- labelfertig.setBounds(113, 293, 71, 14);
+ labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfertig.setBounds(183, 293, 108, 14);
contentPanel.add(labelfertig);
UpSpeed = new JLabel("0");
- UpSpeed.setBounds(329, 243, 95, 14);
+ UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
+ UpSpeed.setBounds(374, 243, 117, 14);
contentPanel.add(UpSpeed);
JLabel label_4 = new JLabel("von:");
- label_4.setBounds(184, 293, 46, 14);
+ label_4.setBounds(318, 293, 46, 14);
contentPanel.add(label_4);
labelfilesize = new JLabel("0");
- labelfilesize.setBounds(240, 293, 108, 14);
+ labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfilesize.setBounds(374, 293, 117, 14);
contentPanel.add(labelfilesize);
JLabel label_6 = new JLabel("Verbleibend:");
- label_6.setBounds(57, 318, 71, 14);
+ label_6.setBounds(102, 318, 71, 14);
contentPanel.add(label_6);
JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
- label_7.setBounds(57, 268, 150, 14);
+ label_7.setBounds(102, 268, 150, 14);
contentPanel.add(label_7);
labelZeit = new JLabel("0");
- labelZeit.setBounds(329, 268, 117, 14);
+ labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
+ labelZeit.setBounds(374, 268, 117, 14);
contentPanel.add(labelZeit);
labelverbleibend = new JLabel("0");
- labelverbleibend.setBounds(138, 318, 108, 14);
+ labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
+ labelverbleibend.setBounds(183, 318, 108, 14);
contentPanel.add(labelverbleibend);
JPanel panel = new JPanel();
@@ -221,7 +233,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
panel.add(lblUploadIhresImage);
JTextPane txtpnFhreSieBitte = new JTextPane();
- txtpnFhreSieBitte.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
+ txtpnFhreSieBitte
+ .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
txtpnFhreSieBitte.setEditable(false);
txtpnFhreSieBitte.setBackground(SystemColor.menu);
txtpnFhreSieBitte.setBounds(10, 36, 509, 32);
@@ -261,6 +274,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
btnCopyFileTo.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
+ System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName());
client.startFileCopy(user.path + "/" + uploadFile.getName());
} catch (TException e1) {
// TODO Auto-generated catch block
@@ -268,24 +282,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
}
});
- btnCopyFileTo.setBounds(57, 343, 217, 23);
+ btnCopyFileTo.setBounds(102, 343, 173, 23);
contentPanel.add(btnCopyFileTo);
- JLabel label_8 = new JLabel("1.");
- label_8.setBounds(24, 128, 23, 14);
- contentPanel.add(label_8);
+ JLabel lblShritt = new JLabel("Schritt 1:");
+ lblShritt.setBounds(24, 128, 57, 14);
+ contentPanel.add(lblShritt);
- JLabel label_9 = new JLabel("2.");
- label_9.setBounds(24, 172, 23, 14);
- contentPanel.add(label_9);
+ JLabel lblSchritt = new JLabel("Schritt 2:");
+ lblSchritt.setBounds(24, 172, 57, 14);
+ contentPanel.add(lblSchritt);
- JLabel label_10 = new JLabel("3.");
- label_10.setBounds(20, 391, 23, 14);
- contentPanel.add(label_10);
+ JLabel lblSchritt_1 = new JLabel("Schritt 3:");
+ lblSchritt_1.setBounds(20, 391, 57, 14);
+ contentPanel.add(lblSchritt_1);
JLabel lblKlickenSieAuf = new JLabel(
"Klicken Sie auf \"Fertigstellen\".");
- lblKlickenSieAuf.setBounds(53, 391, 241, 14);
+ lblKlickenSieAuf.setBounds(98, 391, 241, 14);
contentPanel.add(lblKlickenSieAuf);
{
JPanel buttonPane = new JPanel();
@@ -326,6 +340,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
}
});
+ JButton btnZurck = new JButton("Zur\u00FCck");
+ btnZurck.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();
+ m.setVisible(true);
+ }
+ });
+ btnZurck.setActionCommand("Cancel");
+ buttonPane.add(btnZurck);
+
cancelButton.setActionCommand("Cancel");
buttonPane.add(cancelButton);
finishButton.setActionCommand("Cancel");
@@ -400,7 +425,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
progress = (Integer) arg0.getNewValue();
progressBar.setValue(progress);
- // Button zum Fertigstellen freischalten
+ // Button zum Fertigstellen freischalten, wenn 100% erreicht sind
if (progress == 100) {
finishButton.setEnabled(true);
}
diff --git a/Dozentenmodul/src/gui/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java
index 4225a295..ee7727c3 100644
--- a/Dozentenmodul/src/gui/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/SearchImage_GUI.java
@@ -1,6 +1,5 @@
package gui;
-
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -34,6 +33,7 @@ import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.JTextPane;
+import javax.swing.ListSelectionModel;
import javax.swing.RowFilter;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -62,14 +62,17 @@ public class SearchImage_GUI extends JFrame {
JTable tablemyImages;
private JTextField textFieldName;
JTabbedPane tabbedPane;
- String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
- ThriftConnection con=new ThriftConnection();
- Client client=con.getThriftConnection();
- final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
- final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 );
- final TableRowSorter rowSorterAll = new TableRowSorter( modelAll );
- final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages );
-
+ String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+ "Verantwortlicher", "Letztes Update", "Schlagwort" };
+ ThriftConnection con = new ThriftConnection();
+ Client client = con.getThriftConnection();
+ final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+ final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
+ final TableRowSorter rowSorterAll = new TableRowSorter(
+ modelAll);
+ final TableRowSorter rowSorterMyImages = new TableRowSorter(
+ modelMyImages);
+
/**
* Launch the application.
*/
@@ -90,34 +93,31 @@ public class SearchImage_GUI extends JFrame {
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent arg0) {
- //Beendet die Anwendung nach klick auf X
+ // Beendet die Anwendung nach klick auf X
System.exit(0);
}
});
- //Verhindert das Vergrößern Des Fensters
+ // Verhindert das Vergrößern Des Fensters
setResizable(false);
-
+
try {
- //Setzt das Look & Feel auf System
+ // Setzt das Look & Feel auf System
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- //Setzt den Fenstertitel
+ // Setzt den Fenstertitel
setTitle("bwLehrpool Suite *Prototyp*");
- //Zentriert das Fenster in die Bildmitte
+ // Zentriert das Fenster in die Bildmitte
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 722) / 2;
- int left=(screenSize.width - 603) / 2;
+ int top = (screenSize.height - 722) / 2;
+ int left = (screenSize.width - 603) / 2;
setBounds(left, top, 603, 722);
-
-
- final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-
-
+ final DefaultTableModel model = new DefaultTableModel(titles, 0);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
@@ -131,11 +131,12 @@ public class SearchImage_GUI extends JFrame {
panel.add(lblNewLabel);
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
}
-
+
JTextPane txtpnBitteWhlenSie = new JTextPane();
txtpnBitteWhlenSie.setEditable(false);
txtpnBitteWhlenSie.setBackground(SystemColor.menu);
- txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+ txtpnBitteWhlenSie
+ .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
panel.add(txtpnBitteWhlenSie);
}
@@ -144,144 +145,145 @@ public class SearchImage_GUI extends JFrame {
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
-
+
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
- panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
+ TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_1.setBounds(10, 49, 557, 131);
contentPanel.add(panel_1);
panel_1.setLayout(null);
-
+
JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
lblNewLabel_2.setBounds(10, 30, 250, 20);
panel_1.add(lblNewLabel_2);
-
+
JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
-
+
textFieldName = new JTextField();
- //Key Listener der Tastatureingabe registriert
+ // Key Listener der Tastatureingabe registriert
textFieldName.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
- //Textfield eingabe auslesen
- String stext=textFieldName.getText();
-
- //Wenn Textfield nicht leer
- if(stext!="")
- {
- //Filtere nach der Eingabe
- rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
-
- }
- }});
+ // Textfield eingabe auslesen
+ String stext = textFieldName.getText();
+
+ // Wenn Textfield nicht leer
+ if (stext != "") {
+ // Filtere nach der Eingabe
+ rowSorterAll.setRowFilter(RowFilter.regexFilter(
+ textFieldName.getText(), 0));
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+ textFieldName.getText(), 0));
+ }
+ }
+ });
textFieldName.setBounds(270, 30, 250, 20);
panel_1.add(textFieldName);
textFieldName.setColumns(10);
-
- JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche");
+
+ JLabel lblErweiterteSuche = new JLabel(
+ "Erweiterte Suche");
lblErweiterteSuche.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- //Öffnet das Fenster Extended GUI
- ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+ // Öffnet das Fenster Extended GUI
+ ExtendedSearch_GUI es = new ExtendedSearch_GUI();
es.setVisible(true);
}
});
lblErweiterteSuche.setForeground(Color.BLUE);
-
+
lblErweiterteSuche.setBounds(431, 106, 89, 14);
panel_1.add(lblErweiterteSuche);
-
+
comboBox = new JComboBox();
try {
- //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
- List list=client.getAllOS();
- //Leeres Item hinzufügen
+ // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
+ List list = client.getAllOS();
+ // Leeres Item hinzufügen
comboBox.addItem("");
- for(int i=0;i");
label_1.setBounds(69, 11, 13, 14);
contentPanel.add(label_1);
-
+
JLabel lblVlimage = new JLabel("VL-Image");
lblVlimage.setForeground(Color.BLUE);
lblVlimage.setBounds(81, 11, 45, 14);
contentPanel.add(lblVlimage);
-
+
JLabel label_2 = new JLabel(">");
label_2.setBounds(133, 11, 13, 14);
contentPanel.add(label_2);
-
+
JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
lblNewLabel_1.setBounds(146, 11, 85, 14);
contentPanel.add(lblNewLabel_1);
-
+
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
tabbedPane.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent arg0) {
System.out.println(tabbedPane.getSelectedIndex());
- if(tabbedPane.getSelectedIndex()==0){
-
-
-
- }
- else if(tabbedPane.getSelectedIndex()==1){
- String username="Spitzer Tobias";
- rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
- //rowSorterMyImages.toggleSortOrder(0);
+ if (tabbedPane.getSelectedIndex() == 0) {
+
+ } else if (tabbedPane.getSelectedIndex() == 1) {
+ String username = "Spitzer Tobias";
+ rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+ username, 4));
+ // rowSorterMyImages.toggleSortOrder(0);
}
-
+
}
});
tabbedPane.setBounds(10, 197, 557, 300);
contentPanel.add(tabbedPane);
-
+
JScrollPane scrollPaneMyImage = new JScrollPane();
- tablemyImages=new JTable();
+ tablemyImages = new JTable();
tablemyImages.setModel(modelMyImages);
tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -290,9 +292,9 @@ public class SearchImage_GUI extends JFrame {
tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
initTableModel(modelMyImages);
tablemyImages.setRowSorter(rowSorterMyImages);
-
+
JScrollPane scrollPaneAllImages = new JScrollPane();
- tableAllImages=new JTable();
+ tableAllImages = new JTable();
tableAllImages.setModel(modelAll);
tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -301,15 +303,15 @@ public class SearchImage_GUI extends JFrame {
tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
initTableModel(modelAll);
tableAllImages.setRowSorter(rowSorterAll);
-
- scrollPaneAllImages.setViewportView(tableAllImages);
- tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
+ 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();
+ JTable tableCoopImages = new JTable();
tableCoopImages.setModel(model);
tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -318,11 +320,12 @@ public class SearchImage_GUI extends JFrame {
tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPaneCoopImages.setViewportView(tableCoopImages);
- tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
+ tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages,
+ null);
tabbedPane.setEnabledAt(2, false);
-
+
JScrollPane scrollPanePublicImages = new JScrollPane();
- JTable tablePublicImages=new JTable();
+ JTable tablePublicImages = new JTable();
tablePublicImages.setModel(model);
tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -331,11 +334,12 @@ public class SearchImage_GUI extends JFrame {
tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPanePublicImages.setViewportView(tablePublicImages);
- tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
+ tabbedPane.addTab("\u00D6ffentliche Images", null,
+ scrollPanePublicImages, null);
tabbedPane.setEnabledAt(3, false);
-
+
JScrollPane scrollPanePublicVorlagen = new JScrollPane();
- JTable tablePublicVorlagen=new JTable();
+ JTable tablePublicVorlagen = new JTable();
tablePublicVorlagen.setModel(model);
tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -344,17 +348,15 @@ public class SearchImage_GUI extends JFrame {
tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
- tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
+ tabbedPane.addTab("\u00D6ffentliche Vorlagen", null,
+ scrollPanePublicVorlagen, null);
tabbedPane.setEnabledAt(4, false);
-
-
-
JButton btnDownload = new JButton("Download");
btnDownload.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- //Öffnet den Downloader
- FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+ // Öffnet den Downloader
+ FTPDownloader_GUI down = new FTPDownloader_GUI("Test");
down.setVisible(true);
SearchImage_GUI.this.setVisible(false);
}
@@ -368,78 +370,83 @@ public class SearchImage_GUI extends JFrame {
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
{
- JButton okButton = new JButton("Zur\u00FCck");
- okButton.addActionListener(new ActionListener() {
+ JButton cancelButton = new JButton("Zur\u00FCck");
+ cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- //Öffnet das Hauptmenü
- MainMenue_GUI main=new MainMenue_GUI();
+ // Öffnet das Hauptmenü
+ MainMenue_GUI main = new MainMenue_GUI();
main.setVisible(true);
dispose();
}
});
- okButton.setActionCommand("OK");
- buttonPane.add(okButton);
- getRootPane().setDefaultButton(okButton);
+ cancelButton.setActionCommand("OK");
+ buttonPane.add(cancelButton);
+ getRootPane().setDefaultButton(cancelButton);
}
{
- JButton cancelButton = new JButton("Weiter");
- cancelButton.addActionListener(new ActionListener() {
+ JButton continueButton = new JButton("Weiter");
+ continueButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
+ EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
ea.setVisible(true);
dispose();
-
+
}
});
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
+ continueButton.setActionCommand("Cancel");
+ buttonPane.add(continueButton);
}
}
-
+
JSeparator separator = new JSeparator();
separator.setBounds(0, 78, 597, 2);
getContentPane().add(separator);
-
+
JSeparator separator_1 = new JSeparator();
separator_1.setBounds(0, 627, 597, 2);
getContentPane().add(separator_1);
-
+
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
-
+
JMenu mnNewMenu_1 = new JMenu("Hilfe");
menuBar.add(mnNewMenu_1);
-
+
JMenuItem mntmFaq = new JMenuItem("FAQ");
mnNewMenu_1.add(mntmFaq);
-
+
JMenuItem mntmOtrs = new JMenuItem("OTRS");
mnNewMenu_1.add(mntmOtrs);
-
+
}
- //Initiale Beffülung eines Table models
- public DefaultTableModel initTableModel(DefaultTableModel model){
+
+ // Initiale Beffülung eines Table models
+ public DefaultTableModel initTableModel(DefaultTableModel model) {
List images;
try {
- //Hole eine Liste der Images
-
+ // Hole eine Liste der Images
+
images = client.getImageList();
- Iterator i=images.iterator();
-
- int x=0;
-
- while(i.hasNext())
- {
- //erzeuge Objekte für die Tabelle
- Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()};
- //Füge diese Objekte der Tabelle hinzu
+ Iterator i = images.iterator();
+
+ int x = 0;
+
+ while (i.hasNext()) {
+ // erzeuge Objekte für die Tabelle
+ Object[] obj = { images.get(x).getImageName(),
+ images.get(x).getLicenseRestriction(),
+ images.get(x).getOsName(),
+ images.get(x).getLectureName(),
+ images.get(x).getUserData(),
+ images.get(x).getUpdateTime() };
+ // Füge diese Objekte der Tabelle hinzu
model.addRow(obj);
x++;
i.next();
-
+
}
-
+
return model;
} catch (TException e1) {
// TODO Auto-generated catch block
@@ -447,7 +454,5 @@ public class SearchImage_GUI extends JFrame {
}
return model;
}
-
- }
-
+}
diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java
index 2a2bbf35..79f4a123 100644
--- a/Dozentenmodul/src/thrift/ThriftConnection.java
+++ b/Dozentenmodul/src/thrift/ThriftConnection.java
@@ -25,7 +25,7 @@ public class ThriftConnection {
final Server.Client client = new Server.Client(protocol);
- System.out.println("Der Server läuft!");
+ System.out.println("Verbindung wurde aufgebaut.");
return client;
}
diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class
index 30db4102..8635e9d8 100644
Binary files a/Dozentenmodulserver/bin/server/BinaryListener.class and b/Dozentenmodulserver/bin/server/BinaryListener.class differ
diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 3e78390a..4bb45a96 100644
Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ
diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class
index bd79ab19..9788373f 100644
Binary files a/Dozentenmodulserver/bin/server/startServer.class and b/Dozentenmodulserver/bin/server/startServer.class differ
diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java
index 7c546fee..7d8b94b5 100644
--- a/Dozentenmodulserver/src/server/BinaryListener.java
+++ b/Dozentenmodulserver/src/server/BinaryListener.java
@@ -20,12 +20,13 @@ public class BinaryListener implements Runnable
final TServerTransport transport;
try {
transport = new TServerSocket( 9090 );
+ log.info("Connected to Port 9090");
} catch ( TTransportException e ) {
log.fatal( "Could not listen on port 9090" );
return;
}
TServer server = new TSimpleServer( new Args( transport ).processor( processor ) );
- log.info("Starting TSimpleServer");
+ log.info("Starting Running Server");
server.serve();
}
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 44f0c216..dccda971 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -211,6 +211,7 @@ public class ServerHandler implements Server.Iface {
System.out.println("Vor Move" +new Date());
try {
+ //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen?
FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName()));
} catch (IOException e) {
// TODO Auto-generated catch block
diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 46b9a2f1..7a93183d 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -1,6 +1,7 @@
package server;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import org.apache.log4j.BasicConfigurator;
@@ -22,7 +23,7 @@ public class startServer {
public static void main(String[] args) {
BasicConfigurator.configure();
- log.info( "Starting Application" );
+ log.info( new Date() + ", starting Application\n" );
Thread t;
t = new Thread(new BinaryListener());
servers.add(t);
@@ -41,7 +42,7 @@ public class startServer {
}
}
}
- log.info( "All Servers shut down, exiting..." );
+ log.info( new Date()+", all Servers shut down, exiting...\n" );
}
--
cgit v1.2.3-55-g7522
From 4acab74e19b08290b4e8b9a8c7171885c222aee5 Mon Sep 17 00:00:00 2001
From: unknown
Date: Fri, 4 Apr 2014 16:42:54 +0200
Subject: Diverse Bugfixes und neue Grafik
---
.../GUI/EingabeVeranstaltungAllgemein_GUI$1.class | Bin 1035 -> 1035 bytes
.../GUI/EingabeVeranstaltungAllgemein_GUI$2.class | Bin 859 -> 859 bytes
.../GUI/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 928 -> 928 bytes
.../GUI/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 925 -> 925 bytes
.../GUI/EingabeVeranstaltungAllgemein_GUI.class | Bin 10360 -> 10791 bytes
Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class | Bin 6375 -> 6375 bytes
Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 11984 -> 12001 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$1.class | Bin 662 -> 895 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$2.class | Bin 1453 -> 1457 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$3.class | Bin 730 -> 730 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$4.class | Bin 1478 -> 1478 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$5.class | Bin 739 -> 739 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$6.class | Bin 781 -> 942 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI$7.class | Bin 2402 -> 3172 bytes
Dozentenmodul/bin/GUI/LinkImage_GUI.class | Bin 11187 -> 11346 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI$4.class | Bin 996 -> 1058 bytes
Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 10763 -> 10887 bytes
Dozentenmodul/bin/GUI/SearchImage_GUI.class | Bin 11734 -> 11734 bytes
Dozentenmodul/bin/Image_zu_Veranstaltung_HDD.png | Bin 0 -> 34300 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$1.class | Bin 1035 -> 1035 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$2.class | Bin 859 -> 859 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 928 -> 928 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 925 -> 925 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$5.class | Bin 1911 -> 1911 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI$6.class | Bin 3027 -> 3031 bytes
.../gui/EingabeVeranstaltungAllgemein_GUI.class | Bin 10360 -> 10791 bytes
Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class | Bin 692 -> 692 bytes
Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class | Bin 833 -> 833 bytes
Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class | Bin 813 -> 813 bytes
Dozentenmodul/bin/gui/ExtendedSearch_GUI.class | Bin 6375 -> 6375 bytes
Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 11984 -> 12001 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$1.class | Bin 662 -> 895 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$2.class | Bin 1453 -> 1457 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$3.class | Bin 730 -> 730 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$4.class | Bin 1478 -> 1478 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$5.class | Bin 739 -> 739 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$6.class | Bin 781 -> 942 bytes
Dozentenmodul/bin/gui/LinkImage_GUI$7.class | Bin 2402 -> 3172 bytes
Dozentenmodul/bin/gui/LinkImage_GUI.class | Bin 11187 -> 11346 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$1.class | Bin 662 -> 662 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$10.class | Bin 793 -> 793 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$11.class | Bin 1005 -> 1068 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$12.class | Bin 1816 -> 1816 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$2.class | Bin 729 -> 729 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$3.class | Bin 740 -> 740 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$4.class | Bin 996 -> 1058 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$5.class | Bin 976 -> 976 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$6.class | Bin 947 -> 947 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$7.class | Bin 1031 -> 1038 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$8.class | Bin 973 -> 1053 bytes
Dozentenmodul/bin/gui/MainMenue_GUI$9.class | Bin 944 -> 944 bytes
Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 10763 -> 10887 bytes
Dozentenmodul/bin/gui/SearchImage_GUI$9.class | Bin 809 -> 930 bytes
Dozentenmodul/bin/gui/SearchImage_GUI.class | Bin 11734 -> 11734 bytes
Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png | Bin 0 -> 34300 bytes
.../src/GUI/EingabeVeranstaltungAllgemein_GUI.java | 48 ++--
Dozentenmodul/src/GUI/ExtendedSearch_GUI.java | 1 +
Dozentenmodul/src/GUI/FTPUploader_GUI.java | 6 +-
Dozentenmodul/src/GUI/LinkImage_GUI.java | 294 ++++++++++++---------
Dozentenmodul/src/GUI/MainMenue_GUI.java | 46 ++--
Dozentenmodul/src/GUI/SearchImage_GUI.java | 1 +
.../src/gui/EingabeVeranstaltungAllgemein_GUI.java | 48 ++--
Dozentenmodul/src/gui/ExtendedSearch_GUI.java | 1 +
Dozentenmodul/src/gui/FTPUploader_GUI.java | 6 +-
Dozentenmodul/src/gui/LinkImage_GUI.java | 294 ++++++++++++---------
Dozentenmodul/src/gui/MainMenue_GUI.java | 46 ++--
Dozentenmodul/src/gui/SearchImage_GUI.java | 1 +
Dozentenmodulserver/bin/util/XMLCreator.class | Bin 6252 -> 6292 bytes
Dozentenmodulserver/src/util/XMLCreator.java | 192 +++++++-------
69 files changed, 544 insertions(+), 440 deletions(-)
create mode 100644 Dozentenmodul/bin/Image_zu_Veranstaltung_HDD.png
create mode 100644 Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png
(limited to 'Dozentenmodul/bin/GUI/FTPUploader_GUI.class')
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class
index 95158b5d..351eac91 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class
index 8015544b..26a0b9ad 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class
index 4796831e..99c0174e 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class
index 287ba784..54053623 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class
index 87239abd..1614b33b 100644
Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class
index 5c5857a5..567cb8a9 100644
Binary files a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class and b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
index b1d61364..88b2815c 100644
Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class
index a0a9eb95..592ffc31 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class
index 59117e1c..05132e61 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class
index c6115895..6872589c 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class
index 1c0ad2e0..d56819a3 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class
index a666be6d..d4ea86c6 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class
index 0b50d8a6..f1cd179d 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class
index c2ded647..40df5002 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class differ
diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI.class b/Dozentenmodul/bin/GUI/LinkImage_GUI.class
index fdbfbc72..d9cfd2ea 100644
Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
index 556b11db..995f1202 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class differ
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index 9c8c5535..c6188012 100644
Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI.class differ
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
index 87386672..d014f8d0 100644
Binary files a/Dozentenmodul/bin/GUI/SearchImage_GUI.class and b/Dozentenmodul/bin/GUI/SearchImage_GUI.class differ
diff --git a/Dozentenmodul/bin/Image_zu_Veranstaltung_HDD.png b/Dozentenmodul/bin/Image_zu_Veranstaltung_HDD.png
new file mode 100644
index 00000000..39b3bac6
Binary files /dev/null and b/Dozentenmodul/bin/Image_zu_Veranstaltung_HDD.png differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class
index 95158b5d..351eac91 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class
index 8015544b..26a0b9ad 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class
index 4796831e..99c0174e 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class
index 287ba784..54053623 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class
index 34db5dc5..6f6df5ca 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class
index 382a27cf..9eaac71c 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class
index 87239abd..1614b33b 100644
Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class
index 14bb24a5..35128bac 100644
Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class and b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class
index dd35be9f..d1fc8d5b 100644
Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class and b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class
index 465fc151..86321ae8 100644
Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class and b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class
index 5c5857a5..567cb8a9 100644
Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class and b/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class
index b1d61364..88b2815c 100644
Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$1.class b/Dozentenmodul/bin/gui/LinkImage_GUI$1.class
index a0a9eb95..592ffc31 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$1.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$2.class b/Dozentenmodul/bin/gui/LinkImage_GUI$2.class
index 59117e1c..05132e61 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$2.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$3.class b/Dozentenmodul/bin/gui/LinkImage_GUI$3.class
index c6115895..6872589c 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$3.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$4.class b/Dozentenmodul/bin/gui/LinkImage_GUI$4.class
index 1c0ad2e0..d56819a3 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$4.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$5.class b/Dozentenmodul/bin/gui/LinkImage_GUI$5.class
index a666be6d..d4ea86c6 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$5.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$6.class b/Dozentenmodul/bin/gui/LinkImage_GUI$6.class
index 0b50d8a6..f1cd179d 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$6.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class
index c2ded647..40df5002 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI.class b/Dozentenmodul/bin/gui/LinkImage_GUI.class
index fdbfbc72..d9cfd2ea 100644
Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI.class and b/Dozentenmodul/bin/gui/LinkImage_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
index 57b08981..ae9c04f3 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class
index d339898a..12eefe5e 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class
index 1021e00c..16af50d0 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class
index d16963df..fab4ce2b 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class
index 77e0fbd6..a19fcb59 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class
index 6e35da4f..9ae0a452 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
index 556b11db..995f1202 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class
index 953c5c22..0317cac0 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class
index 69b80c5f..416d44d4 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class
index cb9cbe82..c991ffd3 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class
index fc114f01..ef110e30 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class
index 60491c0b..a81507c6 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class differ
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class
index 9c8c5535..c6188012 100644
Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/MainMenue_GUI.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class
index 28b5e4df..679115d8 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class and b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class differ
diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI.class b/Dozentenmodul/bin/gui/SearchImage_GUI.class
index 87386672..d014f8d0 100644
Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/SearchImage_GUI.class differ
diff --git a/Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png b/Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png
new file mode 100644
index 00000000..39b3bac6
Binary files /dev/null and b/Dozentenmodul/img/Image_zu_Veranstaltung_HDD.png differ
diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
index f550c2b9..5b2d4751 100644
--- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
@@ -60,8 +60,6 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
// aktiv sein darf
boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect,
isAllInformationReady = false;
-
-
/**
* Launch the application.
@@ -251,6 +249,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
txtFldVeranstaltungsname = new JTextField();
txtFldVeranstaltungsname.setColumns(10);
txtFldVeranstaltungsname.setBounds(200, 22, 347, 20);
+ txtFldVeranstaltungsname.setText(Lecture.lecture.getName());
panel_2.add(txtFldVeranstaltungsname);
JTextArea textArea = new JTextArea();
@@ -273,6 +272,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
description = new JTextArea();
description.setFont(new Font("Tahoma", Font.PLAIN, 11));
description.setLineWrap(true);
+ description.setText(Lecture.lecture.getDesc());
scrollPane.add(description);
description.setBounds(0, 0, 4, 22);
scrollPane.add(description);
@@ -282,6 +282,13 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
// Monate in der Zukunft
// liegen
dateChooserend.setDate(endDate);
+ if (Lecture.lecture.getEnddate() == null) {
+ // is not defined yet
+ dateChooserend.setDate(endDate);
+ } else {
+ // already defined from last visit on this page
+ dateChooserend.setDate(Lecture.lecture.getEnddate());
+ }
dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss");
dateChooserend.setBounds(404, 188, 143, 20);
panel_2.add(dateChooserend);
@@ -291,9 +298,14 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
panel_2.add(lblBis);
dateChooserstart = new JDateChooser();
- dateChooserstart.setDate(startDate);
+ if (Lecture.lecture.getStartdate() == null) {
+ // is not defined yet
+ dateChooserstart.setDate(startDate);
+ } else {
+ // already defined from last visit on this page
+ dateChooserstart.setDate(Lecture.lecture.getStartdate());
+ }
dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
-
dateChooserstart.setBounds(226, 188, 143, 20);
panel_2.add(dateChooserstart);
@@ -302,15 +314,13 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
panel_2.add(label_6);
JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *");
- label_10.setBounds(10, 188, 250, 14);
+ label_10.setBounds(10, 194, 127, 14);
panel_2.add(label_10);
JLabel label_11 = new JLabel("Aktiv:");
label_11.setBounds(10, 229, 127, 14);
panel_2.add(label_11);
-
-
radioButtonyes = new JRadioButton("Ja");
radioButtonyes.setSelected(true);
radioButtonyes.setBounds(200, 225, 73, 23);
@@ -332,9 +342,13 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
radioButtonno.setBounds(296, 225, 73, 23);
panel_2.add(radioButtonno);
- JLabel label_12 = new JLabel("(Im VMChooser sichtbar)");
- label_12.setBounds(10, 254, 127, 14);
- panel_2.add(label_12);
+ JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)");
+ lblimVmchooserSichtbar.setBounds(10, 245, 127, 14);
+ panel_2.add(lblimVmchooserSichtbar);
+
+ JLabel lblmaxMonate = new JLabel("(max. 6 Monate)");
+ lblmaxMonate.setBounds(10, 208, 127, 14);
+ panel_2.add(lblmaxMonate);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
@@ -405,21 +419,25 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
|| description.getText().isEmpty() == true) {
// mind 1 Textfeld ist leer
isAllInformationReady = false;
- JOptionPane.showMessageDialog(null,
- "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", "Datum fehlerhaft",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane
+ .showMessageDialog(
+ null,
+ "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
+ "Datum fehlerhaft",
+ JOptionPane.ERROR_MESSAGE);
} else {
// Textfelder bereit
isAllInformationReady = true;
}
- //welcher Radiobutton ist geklickt?
+ // welcher Radiobutton ist geklickt?
if (radioButtonyes.isSelected() == true) {
Lecture.lecture.setActive(true);
} else {
Lecture.lecture.setActive(false);
}
- //Prüfe ob alle Eingaben korrekt sind, dann mache weiter
+ // Prüfe ob alle Eingaben korrekt sind, dann mache
+ // weiter
if (isAllInformationReady == true
&& isDateMaxLifeTimeCorrect == true
&& isDateOrderCorrect == true) {
diff --git a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
index ab9693a7..7f042cae 100644
--- a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
+++ b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
@@ -44,6 +44,7 @@ public class ExtendedSearch_GUI extends JFrame {
ExtendedSearch_GUI dialog = new ExtendedSearch_GUI();
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.setVisible(true);
+
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index f435f3ff..eaaf9544 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -176,9 +176,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
progressBar.setBounds(102, 202, 485, 30);
contentPanel.add(progressBar);
- JLabel label = new JLabel("Downloadgeschwindigkeit:");
- label.setBounds(102, 243, 141, 14);
- contentPanel.add(label);
+ JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
+ lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14);
+ contentPanel.add(lblUploadgeschwindigkeit);
JLabel label_1 = new JLabel("Fertig:");
label_1.setBounds(102, 293, 46, 14);
diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/GUI/LinkImage_GUI.java
index b8b1920e..b4052778 100644
--- a/Dozentenmodul/src/GUI/LinkImage_GUI.java
+++ b/Dozentenmodul/src/GUI/LinkImage_GUI.java
@@ -1,6 +1,5 @@
package gui;
-
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
@@ -29,6 +28,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;
@@ -61,11 +61,11 @@ public class LinkImage_GUI extends JFrame {
JComboBox comboBox;
JTable tableAllImages;
private JTextField textFieldName;
- String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
- ThriftConnection thrift=new ThriftConnection();
- Client client=thrift.getThriftConnection();
+ String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
+ "Verantwortlicher", "Letztes Update", "Schlagwort" };
+ ThriftConnection con = new ThriftConnection();
+ Client client = con.getThriftConnection();
-
/**
* Launch the application.
*/
@@ -88,9 +88,14 @@ public class LinkImage_GUI extends JFrame {
public void windowClosing(WindowEvent arg0) {
System.exit(0);
}
+
+ @Override
+ public void windowOpened(WindowEvent arg0) {
+ textFieldName.requestFocusInWindow();
+ }
});
setResizable(false);
-
+
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (ClassNotFoundException | InstantiationException
@@ -100,15 +105,13 @@ public class LinkImage_GUI extends JFrame {
}
setTitle("bwLehrpool Suite *Prototyp*");
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- int top=(screenSize.height - 603) / 2;
- int left=(screenSize.width - 722) / 2;
+ int top = (screenSize.height - 603) / 2;
+ int left = (screenSize.width - 722) / 2;
setBounds(left, top, 603, 722);
-
- final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
- final DefaultTableModel model = new DefaultTableModel( titles, 0 );
-
-
+ final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
+ final DefaultTableModel model = new DefaultTableModel(titles, 0);
+
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
@@ -122,11 +125,12 @@ public class LinkImage_GUI extends JFrame {
panel.add(lblNewLabel);
lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
}
-
+
JTextPane txtpnBitteWhlenSie = new JTextPane();
txtpnBitteWhlenSie.setEditable(false);
txtpnBitteWhlenSie.setBackground(SystemColor.menu);
- txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+ txtpnBitteWhlenSie
+ .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
panel.add(txtpnBitteWhlenSie);
}
@@ -135,72 +139,70 @@ public class LinkImage_GUI extends JFrame {
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
-
+
JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
- panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ panel_1.setBorder(new TitledBorder(null, "Filterfunktionen",
+ TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_1.setBounds(10, 49, 557, 131);
contentPanel.add(panel_1);
panel_1.setLayout(null);
-
+
JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
lblNewLabel_2.setBounds(10, 30, 250, 20);
panel_1.add(lblNewLabel_2);
-
+
JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
-
+
textFieldName = new JTextField();
textFieldName.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
- String stext=textFieldName.getText();
+ String stext = textFieldName.getText();
modelAll.setRowCount(0);
initTableModel(modelAll);
-
- if(stext!="")
- for(int i=0;iErweiterte Suche