diff options
| author | unknown | 2014-04-17 08:49:41 +0200 |
|---|---|---|
| committer | unknown | 2014-04-17 08:49:41 +0200 |
| commit | 9a0146ebd3e43334b261d1014ce221900a520bef (patch) | |
| tree | 8be75f30cffde5319441f642383c8caa34dc1d89 /Dozentenmodul | |
| parent | g (diff) | |
| parent | Debugging: Jeder Fehler poppt auf in einem Textfenster und kann analysiert we... (diff) | |
| download | tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.tar.gz tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.tar.xz tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodulserver/bin/server/ServerHandler.class
Dozentenmodulserver/src/server/ServerHandler.java
Diffstat (limited to 'Dozentenmodul')
130 files changed, 1678 insertions, 495 deletions
diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differindex 49a2be85..32519c65 100644 --- a/Dozentenmodul/bin/Models/person.class +++ b/Dozentenmodul/bin/Models/person.class diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class Binary files differindex e0536990..8484d422 100644 --- a/Dozentenmodul/bin/ftp/FTPUtility.class +++ b/Dozentenmodul/bin/ftp/FTPUtility.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class Binary files differindex be29eec5..35392672 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class Binary files differindex 07b78998..de93b267 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class Binary files differindex b001474a..be1e5801 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class Binary files differindex c14c26e5..0e5865b9 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class Binary files differindex 2e49913b..6fa84ba9 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class Binary files differdeleted file mode 100644 index 679fea24..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class Binary files differdeleted file mode 100644 index 2d8d670d..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class Binary files differdeleted file mode 100644 index a9efff64..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class Binary files differdeleted file mode 100644 index c3c7d0d4..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class Binary files differdeleted file mode 100644 index d46ad562..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class Binary files differdeleted file mode 100644 index f2192686..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class Binary files differdeleted file mode 100644 index 10b584a7..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class Binary files differdeleted file mode 100644 index cb8ea27e..00000000 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Binary files differindex 4549e05a..adc80d24 100644 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class Binary files differindex c0b072cf..071850c3 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class Binary files differindex edcd12d8..7b09a9c7 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class Binary files differindex 3eded544..34ef1b8c 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class Binary files differdeleted file mode 100644 index aac75f6d..00000000 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class Binary files differindex 4adde720..20f615b4 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class Binary files differindex 03aeea73..e0fabcc6 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class Binary files differdeleted file mode 100644 index 7ffa5033..00000000 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class Binary files differindex 720ce3cd..0d982996 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class Binary files differindex 496f2158..65c67d65 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class Binary files differindex 29269bbd..79c3a835 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex bf24ef25..957d3f55 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class Binary files differindex 3be2f5f1..1b6ed7d5 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class Binary files differindex 217b987a..57505d9b 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class Binary files differindex 0b7106e2..53ce9bf1 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class Binary files differindex 9b5b4107..d72b7fd9 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class Binary files differindex 847b6416..a86cfda4 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class Binary files differindex cb5888ae..4ef7cd96 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Binary files differindex 97b76e5c..2262e784 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class Binary files differindex 8d99419a..563e41cb 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex 71d93a4a..8b947c81 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class Binary files differindex 9e30be11..89997bb5 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class Binary files differindex ff02ba32..fae1e33c 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class Binary files differindex 5b3e93a0..87bf6d5f 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class Binary files differdeleted file mode 100644 index e0ebd234..00000000 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class Binary files differdeleted file mode 100644 index f0cfc5da..00000000 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class Binary files differindex b6600cc8..f8cd9839 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class Binary files differindex 772ed400..35e33e48 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class Binary files differdeleted file mode 100644 index ffde361f..00000000 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class Binary files differindex e2b34c9a..d058454e 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Binary files differindex 264f9d4a..5523e2be 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class Binary files differindex 8dbd7362..a0172be7 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class Binary files differindex 7c32f943..ab7702e4 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class Binary files differindex 5b8f3f8b..c868afe6 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class Binary files differindex f842a022..92fcc494 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class Binary files differindex 2452046f..f8d904d8 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class Binary files differindex eff43b91..5e1dc507 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class Binary files differindex 8b9f3286..46fdf45d 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class Binary files differindex a5ff7a18..1e1dc0f3 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class Binary files differdeleted file mode 100644 index e5ad916e..00000000 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class Binary files differindex fdefc8b5..db67b896 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class Binary files differindex 6a2f53f1..70661228 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class Binary files differindex 16bbf49f..a69337f6 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class Binary files differindex a3ae5059..0d4bafa7 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class Binary files differindex 9d951522..84ebd55c 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class Binary files differindex a064efc0..64948d28 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class Binary files differindex 9c179a21..570e91d4 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$3.class b/Dozentenmodul/bin/gui/intro/Login_GUI$3.class Binary files differdeleted file mode 100644 index 33e222c7..00000000 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$3.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class Binary files differindex 0fa234c1..6db87dc2 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$5.class b/Dozentenmodul/bin/gui/intro/Login_GUI$5.class Binary files differdeleted file mode 100644 index c09574b4..00000000 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$5.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 7f627245..29560f9a 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class Binary files differindex 59f25618..2891e710 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class Binary files differindex 76da6ffd..bd12ec95 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class Binary files differindex d88ea420..c964162e 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class Binary files differindex bb811f7a..f2dd265c 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class Binary files differindex 1cf17778..3ba22ff0 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class Binary files differindex f33e263d..c867b9d2 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class Binary files differindex 715c30d8..e4239a4e 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class Binary files differindex 10cac7e7..fa189dbb 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class Binary files differindex a42c1174..843f828c 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class Binary files differindex 293c16b6..a373ce86 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class Binary files differindex 242c673a..c035deed 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class Binary files differindex 60fcb543..39963963 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class Binary files differindex a61250c1..3f17b0d6 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class Binary files differindex bfa90045..c9b6e28a 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class Binary files differindex 056f8f8d..3485b280 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class Binary files differindex e74b203f..2cd12110 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class Binary files differindex e4b01d60..adcc7fd5 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class Binary files differindex 8bbcc3d0..58677633 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class Binary files differindex 83d7cf3e..81bbec82 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class Binary files differindex 665f51d1..14d5f97e 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class Binary files differdeleted file mode 100644 index b8590387..00000000 --- a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class Binary files differdeleted file mode 100644 index 975fb7c1..00000000 --- a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class Binary files differdeleted file mode 100644 index 9d4fc780..00000000 --- a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class Binary files differdeleted file mode 100644 index 46f15114..00000000 --- a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class Binary files differdeleted file mode 100644 index 92a6a519..00000000 --- a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class +++ /dev/null diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class Binary files differindex 49a2be85..32519c65 100644 --- a/Dozentenmodul/bin/models/person.class +++ b/Dozentenmodul/bin/models/person.class diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class Binary files differindex dd76a766..9b587dd3 100644 --- a/Dozentenmodul/bin/thrift/MasterThriftConnection.class +++ b/Dozentenmodul/bin/thrift/MasterThriftConnection.class diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class Binary files differindex 9b8c9ed9..06cd5a25 100644 --- a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class +++ b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class Binary files differindex 132cbe65..d41ac16a 100644 --- a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class +++ b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class Binary files differindex eaa4e9a6..f17400c1 100644 --- a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class +++ b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class Binary files differindex 0abd2b91..f4f8424d 100644 --- a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class +++ b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class diff --git a/Dozentenmodul/bin/thrift/SessionData$_Fields.class b/Dozentenmodul/bin/thrift/SessionData$_Fields.class Binary files differindex 8a9df0f6..56fd12f4 100644 --- a/Dozentenmodul/bin/thrift/SessionData$_Fields.class +++ b/Dozentenmodul/bin/thrift/SessionData$_Fields.class diff --git a/Dozentenmodul/bin/thrift/SessionData.class b/Dozentenmodul/bin/thrift/SessionData.class Binary files differindex f084b247..c1156dff 100644 --- a/Dozentenmodul/bin/thrift/SessionData.class +++ b/Dozentenmodul/bin/thrift/SessionData.class diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class Binary files differindex f378593f..40003a69 100644 --- a/Dozentenmodul/bin/thrift/ThriftConnection.class +++ b/Dozentenmodul/bin/thrift/ThriftConnection.class diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index 24ab16f3..435f3c1d 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -3,7 +3,9 @@ package models; public class person{ + private String username; + private String Name; private String Vorname; private String Hochschule; @@ -13,6 +15,11 @@ public class person{ private boolean ischecked; + + public static person verantowrtlicher=new person(); + public static person ersteller=new person(); + + public static person verantwortlicher=new person(); @@ -22,6 +29,7 @@ public class person{ public void setUsername(String username) { this.username = username; } + public String getName() { return Name; } diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index 7824440a..b4543349 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -7,6 +7,8 @@ import java.io.OutputStream; import java.net.SocketException; import java.security.NoSuchAlgorithmException; +import javax.swing.JOptionPane; + import models.Image; import org.apache.commons.net.ftp.FTP; @@ -224,6 +226,9 @@ public class FTPUtility { } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 67706169..788acad6 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -69,7 +69,7 @@ public class UploadTask extends SwingWorker<Void, Void> { util.finish(); } catch (FTPException ex) { JOptionPane.showMessageDialog(null, "Error uploading file: " + ex.getMessage(), - "Error", JOptionPane.ERROR_MESSAGE); + "Error", JOptionPane.ERROR_MESSAGE); ex.printStackTrace(); setProgress(0); cancel(true); diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index bf1d0230..f3b4d732 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -73,9 +73,12 @@ public class CreateImageAllgemein_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } //Setzt den Titel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); //Zentriert das Fenster Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index e9d2d91a..cf71082c 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -82,7 +82,7 @@ public class CreateImageTechnisch_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width - 603) / 2; @@ -96,7 +96,7 @@ public class CreateImageTechnisch_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten"); + JLabel lblNewLabel = new JLabel("Eingabe technischer Daten"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -105,7 +105,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie.setText("Geben Sie hier bitte einige technische Daten ein"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index d19e5c9f..66dfc344 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -1,13 +1,12 @@ package gui.image; - import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.HeadlessException; import java.awt.SystemColor; import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -20,7 +19,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.Iterator; import java.util.List; - import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JDialog; @@ -29,6 +27,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; @@ -47,11 +46,12 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; - +import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import javax.swing.ListSelectionModel; @SuppressWarnings("serial") public class DeleteImage_GUI extends JFrame { @@ -65,14 +65,17 @@ public class DeleteImage_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<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll ); - final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages ); - + String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( + modelAll); + final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( + modelMyImages); + /** * Launch the application. */ @@ -93,34 +96,32 @@ public class DeleteImage_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 + con.closeThriftConnection(); 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 - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte + // Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen"); + // 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(); @@ -129,16 +130,18 @@ public class DeleteImage_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); + JLabel lblNewLabel = new JLabel( + "Zu l\u00F6schendes Image w\u00E4hlen"); lblNewLabel.setBounds(10, 11, 509, 22); 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("W\u00E4hlen Sie bitte aus der unten stehenden Liste das zu l\u00F6schende Image aus."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -147,185 +150,199 @@ public class DeleteImage_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("<html><u>Erweiterte Suche</u></html>"); + + JLabel lblErweiterteSuche = new JLabel( + "<html><u>Erweiterte Suche</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearchForImages_GUI es=new ExtendedSearchForImages_GUI(); + // Öffnet das Fenster Extended GUI + con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - + lblErweiterteSuche.setBounds(431, 106, 89, 14); panel_1.add(lblErweiterteSuche); - + comboBox = new JComboBox<String>(); try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List<String> list=client.getAllOS(); - //Leeres Item hinzufügen + // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List<String> list = client.getAllOS(); + // Leeres Item hinzufügen comboBox.addItem(""); - for(int i=0;i<list.size();i++) - { - //Hinzufügen der verfügbaren Betriebssysteme + for (int i = 0; i < list.size(); i++) { + // Hinzufügen der verfügbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } - //Registriert Auswahländerungen der Box + // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Prüft das die Auswahl nicht leer ist - if(comboBox.getSelectedItem().toString()!="") - { - //Filtert nach dem ausgewählten Betriebssystem - rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - } + // Prüft das die Auswahl nicht leer ist + if (comboBox.getSelectedItem().toString() != "") { + // Filtert nach dem ausgewählten Betriebssystem + rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox + .getSelectedItem().toString(), 2)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + comboBox.getSelectedItem().toString(), 2)); + } } - + }); comboBox.setBounds(270, 58, 250, 20); panel_1.add(comboBox); - + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauütmenü + // Öffnet das Hauütmenü + con.closeThriftConnection(); DeleteImage_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + 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("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) { + + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + // String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + } else if (tabbedPane.getSelectedIndex() == 1) { + } - + } }); tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - + initTableModel(modelMyImages); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllImages = new JTable(); + tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + tableAllImages.setModel(modelAll); + tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); + tablemyImages = new JTable(); + tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); - initTableModel(modelMyImages); tablemyImages.setRowSorter(rowSorterMyImages); - initTableModel(modelAll); scrollPaneMyImage.setViewportView(tablemyImages); tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); + JTable tableCoopImages = new JTable(); + tableCoopImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tableCoopImages.setModel(model); tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages=new JTable(); - tableAllImages.setModel(modelAll); - tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); 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.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicImages.setModel(model); tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -334,11 +351,14 @@ public class DeleteImage_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 + .setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicVorlagen.setModel(model); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -347,19 +367,131 @@ public class DeleteImage_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 btnDelete = new JButton("L\u00F6schen"); btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - DeleteImage_GUI.this.setVisible(false); + + String imageid=""; + String imageversion=""; + int eingabe; + + if (tablemyImages.getSelectedRowCount() != 0) { + + // frage, soll das selektierte Daten gelöscht werden? + eingabe = JOptionPane.showConfirmDialog(null, + "Wollen Sie diese Daten löschen?", "Löschen?", + JOptionPane.YES_NO_OPTION); + + if (eingabe == JOptionPane.YES_OPTION) { + + imageid = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7) + .toString(); + + imageversion = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages + .getSelectedRow()), 8) + .toString(); + + // TODO + // Image darf nur gelöscht werden, wenn keine + // Veranstaltung mehr auf das Image verweist. + // Unbdingt abfragen! + + try { + if (!client.connectedToLecture(imageid, + imageversion)) { + System.out.println(imageid); + System.out.println(imageversion); + try { + if (client.deleteImageData(imageid, + imageversion)) { + // if (client.deleteImageServer(imageid + // ,imageversion)) { + + con.closeThriftConnection(); + + + DeleteImage_GUI di = new DeleteImage_GUI(); + di.setVisible(true); + dispose(); + + + /* + * } else { + * + * JOptionPane.showConfirmDialog(null, + * "Löschen vom Server hat leider nicht geklappt!!" + * , imageversion, + * JOptionPane.OK_CANCEL_OPTION); } + */ + + } else { + + JOptionPane + .showConfirmDialog( + null, + "Löschen von der DB hat leider nicht geklappt!!", + "Fehler", + JOptionPane.INFORMATION_MESSAGE); + } + } catch (HeadlessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); + } + // TODO --> client.deleteImageServer(imageid + // ,imageversion) + // das file ist aus der DB raus, aber ist noch + // auf dem Server als Datei hinterlegt. + // dieses muss auch gelöscht werden, um den + // festplattenlatz wieder frei zu geben. + // Hierzu könnte ein löschbefehl an die kommande + // zeile des server geschickt werden + // um das entsprechende file zu löschen. + // identifizieren über den image-namen!! + // z.B. FileUtils.moveFile(tmpFile, new + // File("141.79.128.102:/srv//openslx/nfs/temp/"+ + // tmpFile.getName())); + // FileUtils.ForceDelete (.. ); + + } else { + + JOptionPane.showMessageDialog(null, + "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", + "Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE); + } + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); + } + } + + } else { + + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein eigenes Image aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } + } }); btnDelete.setBounds(449, 508, 118, 23); @@ -371,72 +503,81 @@ public class DeleteImage_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton mainButton = new JButton("Hauptmen\u00FC"); - mainButton.addActionListener(new ActionListener() { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); + // Öffnet das Hauptmenü + con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); dispose(); - } }); - mainButton.setActionCommand("Cancel"); - buttonPane.add(mainButton); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); } } - + 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<server.Image> images; try { - //Hole eine Liste der Images - + // Hole eine Liste der Images images = client.getImageList(); - Iterator<server.Image> 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<server.Image> 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(), "", images.get(x).id, + images.get(x).getVersion() }; + // System.out.println("id:"+images.get(x).getId()); + // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); - + } - + return model; } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } - - } - +} diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index b80e4953..949aeed6 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -79,7 +79,7 @@ public class EditImageAllgemein_GUI extends JFrame { e.printStackTrace(); } //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); //Zentriert das Fenster in der Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -335,6 +335,9 @@ public class EditImageAllgemein_GUI extends JFrame { } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 7d9de383..631e3c2d 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -73,7 +73,7 @@ public class EditImageTechnisch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Titel des Fensters - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -88,7 +88,7 @@ public class EditImageTechnisch_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten"); + JLabel lblNewLabel = new JLabel("Eingabe technischer Daten"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -98,7 +98,7 @@ public class EditImageTechnisch_GUI extends JFrame { txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); txtpnBitteWhlenSie - .setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + .setText("Geben Sie hier bitte einige technische Daten ein."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index cd952d0f..7e6b42a0 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -24,6 +24,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JSeparator; @@ -50,8 +51,8 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + //String host = "141.79.128.121"; + String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; @@ -103,6 +104,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -117,11 +121,14 @@ public class FTPCreateUploader_GUI extends JFrame implements | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -299,6 +306,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -341,6 +351,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -386,6 +399,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); @@ -485,6 +501,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; } return true; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 2ace42c6..ec92396b 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -10,6 +10,7 @@ import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingConstants; @@ -45,8 +46,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + String host = "141.79.128.102"; int port = 21; String downloadFile = ""; static String arg = ""; @@ -81,6 +81,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -100,7 +103,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image herunterladen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -217,17 +220,17 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener panel.setBounds(10, 11, 577, 57); contentPanel.add(panel); - JLabel label = new JLabel("Eingabe Ihrer Daten"); - label.setFont(new Font("Tahoma", Font.BOLD, 18)); - label.setBounds(10, 11, 509, 22); - panel.add(label); + JLabel lblImageDownloader = new JLabel("Image Downloader"); + lblImageDownloader.setFont(new Font("Tahoma", Font.BOLD, 18)); + lblImageDownloader.setBounds(10, 11, 509, 22); + panel.add(lblImageDownloader); - JTextPane textPane = new JTextPane(); - textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); - textPane.setEditable(false); - textPane.setBackground(SystemColor.menu); - textPane.setBounds(10, 36, 509, 32); - panel.add(textPane); + JTextPane txtpnWhlenSieEinen = new JTextPane(); + txtpnWhlenSieEinen.setText("W\u00E4hlen Sie einen Ort aus, um das von Ihnen gw\u00E4hlte Image erunter zu laden."); + txtpnWhlenSieEinen.setEditable(false); + txtpnWhlenSieEinen.setBackground(SystemColor.menu); + txtpnWhlenSieEinen.setBounds(10, 36, 509, 32); + panel.add(txtpnWhlenSieEinen); JSeparator separator = new JSeparator(); separator.setBounds(0, 79, 597, 2); @@ -290,6 +293,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } thrift.closeThriftConnection(); @@ -333,6 +339,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task = new DownloadTask(host, port, user.userName, user.password, diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index a23e85d2..e0c0b6c4 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -24,6 +24,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JSeparator; @@ -49,8 +50,7 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; @@ -124,7 +124,7 @@ public class FTPEditUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -293,6 +293,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -337,6 +340,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -381,6 +387,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); Image.image.setNewName(formatter.format(new Date()) + "_" @@ -467,6 +476,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; } return true; diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index e6bb055e..7c35bf00 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -2,7 +2,6 @@ package gui.image; import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -77,14 +76,6 @@ public class SearchEditImage_GUI extends JFrame { final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages); - /** - * Launch the application. - * - * public static void main(String[] args) { try { SearchEditImage_GUI dialog - * = new SearchEditImage_GUI(); - * dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - * dialog.setVisible(true); } catch (Exception e) { e.printStackTrace(); } } - */ /** * Create the dialog. @@ -115,7 +106,7 @@ public class SearchEditImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -221,6 +212,9 @@ public class SearchEditImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { @@ -274,7 +268,6 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " @@ -513,6 +506,9 @@ public class SearchEditImage_GUI extends JFrame { } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 493230d3..4e6e7046 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -20,12 +20,12 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; @@ -44,6 +44,9 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; +import models.Image; +import models.person; +//import models.person; import org.apache.thrift.TException; @@ -63,7 +66,7 @@ public class SearchImage_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; + "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = con.getThriftConnection(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); @@ -73,18 +76,6 @@ public class SearchImage_GUI extends JFrame { final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchImage_GUI dialog = new SearchImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. @@ -94,8 +85,14 @@ public class SearchImage_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); System.exit(0); } + + @Override + public void windowOpened(WindowEvent arg0) { + textFieldName.requestFocusInWindow(); + } }); // Verhindert das Vergrößern Des Fensters setResizable(false); @@ -109,7 +106,7 @@ public class SearchImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -192,6 +189,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI + con.closeThriftConnection(); ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -214,6 +212,9 @@ public class SearchImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { @@ -237,6 +238,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü + con.closeThriftConnection(); SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -266,14 +268,15 @@ public class SearchImage_GUI extends JFrame { 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"; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + // String username="Spitzer Tobias"; rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - // rowSorterMyImages.toggleSortOrder(0); + } else if (tabbedPane.getSelectedIndex() == 1) { + } } @@ -281,17 +284,7 @@ public class SearchImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages = new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages = new JTable(); @@ -302,13 +295,23 @@ public class SearchImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); - tableAllImages.setRowSorter(rowSorterAll); - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages = new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); scrollPaneMyImage.setViewportView(tablemyImages); tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages = new JTable(); @@ -356,9 +359,28 @@ public class SearchImage_GUI extends JFrame { btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Öffnet den Downloader - FTPDownloader_GUI down = new FTPDownloader_GUI(); - down.setVisible(true); - SearchImage_GUI.this.setVisible(false); + + if (tablemyImages.getSelectedRow() != -1) { + String imageid = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchImage_GUI.this.setVisible(false); + FTPDownloader_GUI down = new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + } else { + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein Image für den Download aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } } }); btnDownload.setBounds(449, 508, 118, 23); @@ -370,33 +392,19 @@ public class SearchImage_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü + con.closeThriftConnection(); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); } }); - cancelButton.setActionCommand("OK"); - buttonPane.add(cancelButton); - getRootPane().setDefaultButton(cancelButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - con.closeThriftConnection(); - EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); } } @@ -427,8 +435,8 @@ public class SearchImage_GUI extends JFrame { List<server.Image> images; try { // Hole eine Liste der Images - images = client.getImageList(); + Iterator<server.Image> i = images.iterator(); int x = 0; @@ -440,7 +448,8 @@ public class SearchImage_GUI extends JFrame { images.get(x).getOsName(), images.get(x).getLectureName(), images.get(x).getUserData(), - images.get(x).getUpdateTime() }; + images.get(x).getUpdateTime(), "", images.get(x).id, + images.get(x).getVersion() }; // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -452,6 +461,9 @@ public class SearchImage_GUI extends JFrame { } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } diff --git a/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index ae31236a..49d7810b 100644 --- a/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -1,7 +1,5 @@ -package gui.lecture; +package gui.image; - -import gui.image.SearchImage_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; @@ -40,9 +38,10 @@ public class SearchMethodLecture_GUI extends JFrame { private final JPanel contentPanel = new JPanel(); String[] result; - JRadioButton rdbtnNachEinemVlimage; - JRadioButton rdbtnNachEinerVeranstaltung; + JRadioButton rdbtnSearchByImage; + JRadioButton rdbtnSearchByLecture; private final ButtonGroup buttonGroup = new ButtonGroup(); + /** * Launch the application. */ @@ -67,7 +66,7 @@ public class SearchMethodLecture_GUI extends JFrame { } }); setResizable(false); - + try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException @@ -75,12 +74,12 @@ public class SearchMethodLecture_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Suchmethode w\u00E4hlen"); 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); - //setBounds(100, 100, 603, 722); + // setBounds(100, 100, 603, 722); getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -89,16 +88,17 @@ public class SearchMethodLecture_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten"); + JLabel lblNewLabel = new JLabel("Suchmethode ausw\u00E4hlen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); } - + JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie + .setText("Geben Sie bitte an, nach welchem Kriterium Sie suchen m\u00F6chten."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -107,74 +107,80 @@ public class SearchMethodLecture_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, "Wählen Sie bitte die Suchmethode Ihrer Suche", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, + "Wählen Sie bitte die Suchmethode Ihrer Suche", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 36, 557, 369); contentPanel.add(panel_1); panel_1.setLayout(null); - - rdbtnNachEinemVlimage = new JRadioButton("Nach einem VL-Image oder Vorlagen suchen"); - buttonGroup.add(rdbtnNachEinemVlimage); - rdbtnNachEinemVlimage.setBounds(6, 38, 545, 23); - panel_1.add(rdbtnNachEinemVlimage); - + + rdbtnSearchByImage = new JRadioButton( + "Nach einem VL-Image oder Vorlagen suchen"); + buttonGroup.add(rdbtnSearchByImage); + rdbtnSearchByImage.setBounds(6, 38, 545, 23); + panel_1.add(rdbtnSearchByImage); + JTextArea txtrHierKlickenWenn = new JTextArea(); txtrHierKlickenWenn.setBackground(SystemColor.menu); txtrHierKlickenWenn.setLineWrap(true); txtrHierKlickenWenn.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrHierKlickenWenn.setText("Hier klicken, wenn Sie nach einem konkreten Image suchen, von dem Sie exakte Daten kennen. Hierzu geh\u00F6ren z.B. das Betriebssystem oder die installierte Software.\r\nEs werden zudem alle Vorlagen aufgelistet."); + txtrHierKlickenWenn + .setText("Hier klicken, wenn Sie nach einem konkreten Image suchen, von dem Sie exakte Daten kennen. Hierzu geh\u00F6ren z.B. das Betriebssystem oder die installierte Software.\r\nEs werden zudem alle Vorlagen aufgelistet."); txtrHierKlickenWenn.setBounds(25, 68, 518, 80); panel_1.add(txtrHierKlickenWenn); - + JTextArea txtrHierKlickenWenn_1 = new JTextArea(); - txtrHierKlickenWenn_1.setText("Hier klicken, wenn Sie nur wissen f\u00FCr welche Veranstaltung das gesuchte Image verwendet wird. Hierzu geh\u00F6ren z.B. der Name des Dozenten oder der Name der Veranstaltung."); + txtrHierKlickenWenn_1 + .setText("Hier klicken, wenn Sie nur wissen f\u00FCr welche Veranstaltung das gesuchte Image verwendet wird. Hierzu geh\u00F6ren z.B. der Name des Dozenten oder der Name der Veranstaltung."); txtrHierKlickenWenn_1.setLineWrap(true); txtrHierKlickenWenn_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); txtrHierKlickenWenn_1.setBackground(SystemColor.menu); txtrHierKlickenWenn_1.setBounds(25, 210, 518, 80); panel_1.add(txtrHierKlickenWenn_1); - - rdbtnNachEinerVeranstaltung = new JRadioButton("Nach einer Veranstaltung suchen"); - buttonGroup.add(rdbtnNachEinerVeranstaltung); - rdbtnNachEinerVeranstaltung.setBounds(6, 180, 545, 23); - panel_1.add(rdbtnNachEinerVeranstaltung); - + + rdbtnSearchByLecture = new JRadioButton( + "Nach einer Veranstaltung suchen"); + buttonGroup.add(rdbtnSearchByLecture); + rdbtnSearchByLecture.setBounds(6, 180, 545, 23); + panel_1.add(rdbtnSearchByLecture); + JPanel panel = new JPanel(); panel.setBounds(10, 402, 577, 33); contentPanel.add(panel); panel.setLayout(null); panel.setBorder(new EmptyBorder(5, 5, 5, 5)); panel.setBackground(SystemColor.menu); - + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - + SearchMethodLecture_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + 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("Suchmethode"); lblNewLabel_1.setBounds(146, 11, 82, 14); contentPanel.add(lblNewLabel_1); @@ -185,62 +191,61 @@ public class SearchMethodLecture_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { + JButton backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - MainMenue_GUI sr=new MainMenue_GUI(); + MainMenue_GUI sr = new MainMenue_GUI(); sr.setVisible(true); dispose(); } }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); + backButton.setActionCommand("CANCEL"); + buttonPane.add(backButton); + getRootPane().setDefaultButton(backButton); } { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - if(rdbtnNachEinemVlimage.isSelected()==true) - { - SearchImage_GUI ea=new SearchImage_GUI(); - ea.setVisible(true); - dispose(); - } + + if (rdbtnSearchByImage.isSelected() == true) { + SearchImage_GUI si = new SearchImage_GUI(); + si.setVisible(true); + dispose(); } + } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); + }); + continueButton.setActionCommand("OK"); + 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 = new JMenu("Suchen"); menuBar.add(mnNewMenu); - + JMenuItem mntmVlSuche = new JMenuItem("VL Suche"); mnNewMenu.add(mntmVlSuche); - + 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); - + } } diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index e4f37871..988a8b38 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -20,6 +20,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.JScrollPane; import javax.swing.JSeparator; @@ -129,9 +130,15 @@ public class BillOfRights_GUI extends JFrame { } catch (InvalidFileFormatException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } VmWareLink_GUI ac=new VmWareLink_GUI(); ac.setVisible(true); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index e2db747e..0efbe3cb 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -1,6 +1,6 @@ package gui.intro; - +import java.awt.Color; import java.awt.Dimension; import java.awt.EventQueue; import java.awt.Image; @@ -12,8 +12,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; -import java.nio.channels.SeekableByteChannel; - import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -25,7 +23,6 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; - import models.SessionData; import models.person; import org.apache.thrift.TException; @@ -33,15 +30,22 @@ import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; import thrift.UserInfo; - import config.config_file; +import javax.swing.SwingConstants; @SuppressWarnings("serial") public class Login_GUI extends JFrame { private JPanel contentPane; - private JTextField username; - private JPasswordField pass; + private JTextField lblusername; + private JPasswordField lblpass; + JLabel lblConnectionInfo = new JLabel(""); + boolean isClientReturnedCorrectly = false; + boolean login; + String masterServerIP = MasterThriftConnection.MASTERSERVERIP; + MasterThriftConnection thrift; + Client client; + String token; /** * Launch the application. @@ -65,6 +69,9 @@ public class Login_GUI extends JFrame { } catch (Exception e) { e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getStackTrace(), + "Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -90,6 +97,9 @@ public class Login_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen setTitle("Dozentenmodul *Prototyp*"); @@ -129,16 +139,17 @@ public class Login_GUI extends JFrame { contentPane.add(LabelUser); // Erzeugen und Hinzufügen des Textfeldes - username = new JTextField(); - username.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); - username.addActionListener(new ActionListener() { + lblusername = new JTextField(); + lblusername + .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); + lblusername.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { performLogin(); } }); - username.setBounds(304, 164, 196, 20); - contentPane.add(username); - username.setColumns(10); + lblusername.setBounds(292, 164, 237, 20); + contentPane.add(lblusername); + lblusername.setColumns(10); // Erzeugen und Hinzufügen des Labels JLabel LabelPass = new JLabel("bwIDM-Passwort:"); @@ -153,109 +164,165 @@ public class Login_GUI extends JFrame { }// end actionPerformed }); - BtnLogin.setBounds(304, 244, 196, 23); + BtnLogin.setBounds(292, 244, 237, 23); contentPane.add(BtnLogin); // Erzeugen und Hinzufügen des Passwortfeldes - pass = new JPasswordField(); - pass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); - pass.addActionListener(new ActionListener() { + lblpass = new JPasswordField(); + lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); + lblpass.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { performLogin(); } }); - pass.setBounds(304, 195, 196, 20); - contentPane.add(pass); + lblpass.setBounds(292, 195, 237, 20); + contentPane.add(lblpass); + + lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); + lblConnectionInfo.setBounds(292, 290, 237, 20); + contentPane.add(lblConnectionInfo); }// end LoginGUI() - //Versuche den Benutzer einzuloggen + // Versuche den Benutzer einzuloggen public void performLogin() { - // Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt - // Ldap check=new Ldap(); - boolean login = true; - // boolean login=check.LdapAuth(username.getText(), new - // String(pass.getPassword())); - MasterThriftConnection thrift = new MasterThriftConnection(); - Client client = thrift.getMasterThriftConnection(); - String token = null; - final thrift.SessionData result; + + login = false; + thrift = new MasterThriftConnection(); + client = thrift.getMasterThriftConnection(); + token = null; + thrift.SessionData result = null; + try { - String passText = new String(pass.getPassword()); - System.out.println("Benutzer:" +username.getText() + "\nPasswort" + passText); - result = client.authenticate(username.getText(), passText); - SessionData.session.setAuthToken(result.authToken); - SessionData.session.setSessionID(result.sessionId); - SessionData.session.setServerAdress(result.serverAddress); - System.out.println("Server Adresse: "+result.serverAddress); - + login = true; + String passText = new String(lblpass.getPassword()); + System.out.println("Benutzer: " + lblusername.getText() + + "\nPasswort: " + passText); + + // check if client has received a connection with information or a + // null package + if (checkClientPackage() == true) { + // package has information + result = client.authenticate(lblusername.getText(), passText); + SessionData.session.setAuthToken(result.authToken); + SessionData.session.setSessionID(result.sessionId); + SessionData.session.setServerAdress(result.serverAddress); + System.out.println("Satellit-Adresse: " + result.serverAddress); + + System.out + .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + + result.sessionId + + ", mein Token für den Satelliten " + + result.authToken); + token = result.authToken; + + if (login == true) { + + try { + Wini ini = new Wini( + new File( + "C:\\Users\\" + + System.getProperty("user.name") + + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + // Prüfe ob Bills Of Rights schon akzeptiert wurden, + // wenn + // nicht zeige diese an + if (ini.get("main", "BillOfRights", boolean.class) == false) { + // Erstellen einer Instanz der Aktionsauswahl + BillOfRights_GUI re = new BillOfRights_GUI(); + re.setVisible(true); + // Schließen des Fensters nach erfolgreichen Login + setVisible(false); + } else { + // Prüfe ob die Links zu vmware angezeigt werden + // sollen + if (ini.get("main", "vmware", boolean.class) == false) { + VmWareLink_GUI vm = new VmWareLink_GUI(); + vm.setVisible(true); + setVisible(false); + } else { + UserInfo user = client.getUserFromToken(token); + + String hochschule = user.eMail.substring( + user.eMail.indexOf("@") + 1, + user.eMail.indexOf(".", + user.eMail.indexOf("@"))); + // System.out.println("hochschule="+hochschule); + + person.verantwortlicher.setUsername(lblusername + .getText()); + person.verantwortlicher.setName(user.lastName); + person.verantwortlicher + .setVorname(user.firstName); + person.verantwortlicher.setEMail(user.eMail); + person.verantwortlicher + .setHochschule(hochschule); + + // Öffne das Hauprmenü + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + setVisible(false); + } + } + } catch (IOException | TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); + } + + } else { + JOptionPane.showMessageDialog(null, "Login denied!", + "Message", JOptionPane.INFORMATION_MESSAGE); + } + + } else { + // package from server is null + login = false; + lblConnectionInfo.setForeground(Color.red); + lblConnectionInfo.setText("Fehler: Client nicht mit Server verbunden."); + + } + } catch (thrift.AuthenticationException e) { - System.out.println("Authentifizierung fehlgeschlagen: " + e.message); + System.out + .println("Authentifizierung fehlgeschlagen: " + e.message); + JOptionPane + .showMessageDialog( + null, + "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", + "Anmeldung fehlgeschlagen", + JOptionPane.ERROR_MESSAGE); + e.printStackTrace(); JOptionPane.showMessageDialog(null, - "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", - "Anmeldung fehlgeschlagen", - JOptionPane.ERROR_MESSAGE); - + e.getCause()+"\n"+e.getMessage(), + "Message", JOptionPane.ERROR_MESSAGE); return; } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return; } - System.out - .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " - + result.sessionId - + ", mein Token für den Satelliten " - + result.authToken); - token = result.authToken; - if (login == true) { - - try { - Wini ini = new Wini(new File("C:\\Users\\" - + System.getProperty("user.name") - + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - // Prüfe ob Bills Of Rights schon akzeptiert wurden, wenn nicht - // zeige diese an - if (ini.get("main", "BillOfRights", boolean.class) == false) { - // Erstellen einer Instanz der Aktionsauswahl - BillOfRights_GUI re = new BillOfRights_GUI(); - re.setVisible(true); - // Schließen des Fensters nach erfolgreichen Login - setVisible(false); - } else { - // Prüfe ob die Links zu vmware angezeigt werden sollen - if (ini.get("main", "vmware", boolean.class) == false) { - VmWareLink_GUI vm = new VmWareLink_GUI(); - vm.setVisible(true); - setVisible(false); - } else { - UserInfo user = client.getUserFromToken(token); - - String hochschule = user.eMail.substring(user.eMail - .indexOf("@") + 1, user.eMail.indexOf(".", - user.eMail.indexOf("@"))); - // System.out.println("hochschule="+hochschule); - - person.verantwortlicher.setUsername(username.getText()); - person.verantwortlicher.setName(user.lastName); - person.verantwortlicher.setVorname(user.firstName); - person.verantwortlicher.setEMail(user.eMail); - person.verantwortlicher.setHochschule(hochschule); - - // Öffne das Hauprmenü - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - setVisible(false); - } - } - } catch (IOException | TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + }// end performLogin + public boolean checkClientPackage() { + // check if client is null or has been returned with information + if (client != null) { + // client contains information + isClientReturnedCorrectly = true; + System.out.println("Masterserver (" + masterServerIP + + ") ist erreichbar, Verbindungsinformationen erhalten"); } else { - JOptionPane.showMessageDialog(null, "Login denied!", "Message", - JOptionPane.INFORMATION_MESSAGE); + // client has returned with error + isClientReturnedCorrectly = false; + System.out.println("Fehler: Client hat von Masterserver (" + masterServerIP + + ") keine korrekten Verbindungsdaten erhalten."); } - }// end performLogin + + return isClientReturnedCorrectly; + }// end checkServerConnection() }// end class diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 9965002c..4817e786 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -33,6 +33,8 @@ import java.awt.ScrollPane; import javax.swing.JTextArea; import javax.swing.ImageIcon; +import models.SessionData; + @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -44,9 +46,11 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnImageNew; JRadioButton rdbtnImageEdit; JRadioButton rdbtnImageSearchDownload; - JRadioButton rdbtnVeranstaltungNew; + JRadioButton rdbtnLectureNew; JRadioButton rdbtnImageDelete; - JRadioButton rdbtnVeranstaltungEdit; + JRadioButton rdbtnLectureEdit; + JRadioButton rdbtnLectureDelete; + JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); /** @@ -79,7 +83,7 @@ public class MainMenue_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress()); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -141,7 +145,7 @@ public class MainMenue_GUI extends JFrame { rdbtnImageEdit.setBackground(SystemColor.menu); rdbtnImageDelete = new JRadioButton("L\u00F6schen"); - rdbtnImageDelete.setEnabled(false); + rdbtnImageDelete.setEnabled(true); buttonGroup.add(rdbtnImageDelete); rdbtnImageDelete .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); @@ -151,7 +155,6 @@ public class MainMenue_GUI extends JFrame { panelImage.add(rdbtnImageDelete); rdbtnImageSearchDownload = new JRadioButton("Suche und Download"); - rdbtnImageSearchDownload.setEnabled(false); buttonGroup.add(rdbtnImageSearchDownload); rdbtnImageSearchDownload .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); @@ -190,39 +193,37 @@ public class MainMenue_GUI extends JFrame { panelVeranstaltung.setBounds(10, 327, 270, 170); contentPanel.add(panelVeranstaltung); - rdbtnVeranstaltungNew = new JRadioButton("Neu"); - buttonGroup.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew + rdbtnLectureNew = new JRadioButton("Neu"); + buttonGroup.add(rdbtnLectureNew); + rdbtnLectureNew .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23); - panelVeranstaltung.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew.setBackground(SystemColor.menu); + rdbtnLectureNew.setBounds(6, 24, 185, 23); + panelVeranstaltung.add(rdbtnLectureNew); + rdbtnLectureNew.setBackground(SystemColor.menu); - rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten"); - rdbtnVeranstaltungEdit + rdbtnLectureEdit = new JRadioButton("Bearbeiten"); + rdbtnLectureEdit .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); - rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23); - panelVeranstaltung.add(rdbtnVeranstaltungEdit); - buttonGroup.add(rdbtnVeranstaltungEdit); - rdbtnVeranstaltungEdit.setBackground(SystemColor.menu); - - JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen"); - rdbtnVeranstaltungDelete.setEnabled(false); - rdbtnVeranstaltungDelete + rdbtnLectureEdit.setBounds(6, 50, 230, 23); + panelVeranstaltung.add(rdbtnLectureEdit); + buttonGroup.add(rdbtnLectureEdit); + rdbtnLectureEdit.setBackground(SystemColor.menu); + + rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); + rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungDelete); - buttonGroup.add(rdbtnVeranstaltungDelete); - rdbtnVeranstaltungDelete.setBackground(SystemColor.menu); - - JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche"); - rdbtnVeranstaltungSearch.setEnabled(false); - buttonGroup.add(rdbtnVeranstaltungSearch); - rdbtnVeranstaltungSearch + rdbtnLectureDelete.setBounds(6, 76, 175, 23); + panelVeranstaltung.add(rdbtnLectureDelete); + buttonGroup.add(rdbtnLectureDelete); + rdbtnLectureDelete.setBackground(SystemColor.menu); + + rdbtnLectureSearch = new JRadioButton("Suche"); + buttonGroup.add(rdbtnLectureSearch); + rdbtnLectureSearch .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungSearch.setBackground(SystemColor.menu); - rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungSearch); + rdbtnLectureSearch.setBackground(SystemColor.menu); + rdbtnLectureSearch.setBounds(6, 102, 175, 23); + panelVeranstaltung.add(rdbtnLectureSearch); JPanel panelNews = new JPanel(); panelNews.setLayout(null); @@ -272,24 +273,25 @@ public class MainMenue_GUI extends JFrame { txtDesc.setText(descSearchImage); } }); - rdbtnVeranstaltungNew.addActionListener(new ActionListener() { + rdbtnLectureNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; txtDesc.setText(descNewLecture); } }); - rdbtnVeranstaltungEdit.addActionListener(new ActionListener() { + rdbtnLectureEdit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; txtDesc.setText(descEditLecture); } }); - rdbtnVeranstaltungDelete.addActionListener(new ActionListener() { + rdbtnLectureDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + txtDesc.setText(descDeleteLecture); } }); - rdbtnVeranstaltungSearch.addActionListener(new ActionListener() { + rdbtnLectureSearch.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; txtDesc.setText(descSearchLecture); @@ -343,32 +345,42 @@ public class MainMenue_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + // Images if (rdbtnImageNew.isSelected() == true) { CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); sr.setVisible(true); dispose(); } else if (rdbtnImageEdit.isSelected() == true) { - SearchEditImage_GUI si = new SearchEditImage_GUI(); si.setVisible(true); dispose(); - } else if (rdbtnImageSearchDownload.isSelected() == true) { - SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI(); - sm.setVisible(true); - dispose(); } else if (rdbtnImageDelete.isSelected() == true) { DeleteImage_GUI di = new DeleteImage_GUI(); di.setVisible(true); dispose(); - } else if (rdbtnVeranstaltungNew.isSelected() == true) { + } else if (rdbtnImageSearchDownload.isSelected() == true) { + // SearchMethodLecture_GUI sm = new + // SearchMethodLecture_GUI(); + SearchImage_GUI si = new SearchImage_GUI(); + si.setVisible(true); + dispose(); + // Lectures + } else if (rdbtnLectureNew.isSelected() == true) { CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); av.setVisible(true); dispose(); - } else if (rdbtnVeranstaltungEdit.isSelected() == true) { - //SearchEditLecture_GUI sl = new SearchEditLecture_GUI(); + } else if (rdbtnLectureEdit.isSelected() == true) { EditLectureSearch_GUI el = new EditLectureSearch_GUI(); el.setVisible(true); dispose(); + } else if (rdbtnLectureDelete.isSelected() == true) { + DeleteLecture_GUI dl = new DeleteLecture_GUI(); + dl.setVisible(true); + dispose(); + } else if (rdbtnLectureSearch.isSelected() == true) { + SearchLecture_GUI sl = new SearchLecture_GUI(); + sl.setVisible(true); + dispose(); } } }); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 2f578e8b..1c0a51c0 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -8,6 +8,7 @@ import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; import javax.swing.JDialog; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -123,6 +124,9 @@ public class VmWareLink_GUI extends JFrame { } catch (URISyntaxException | IOException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } @@ -143,9 +147,15 @@ public class VmWareLink_GUI extends JFrame { } catch (InvalidFileFormatException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 936f9b13..02946571 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -100,7 +100,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -412,6 +412,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); + dateChooserend.setDate(endDate); //setze Datum auf maximum } else { // bereit isDateMaxLifeTimeCorrect = true; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 2243fd43..9da0400d 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -105,7 +105,7 @@ public class CreateLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 603) / 2; int left = (screenSize.width - 722) / 2; @@ -122,7 +122,7 @@ public class CreateLectureLink_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen"); + JLabel lblNewLabel = new JLabel("Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -206,9 +206,12 @@ public class CreateLectureLink_GUI extends JFrame { for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); } - } catch (TException e2) { + } catch (TException e) { // TODO Auto-generated catch block - e2.printStackTrace(); + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -374,10 +377,6 @@ public class CreateLectureLink_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); - System.out.println("Veranstaltung angelegt um: " - + formatter.format( - Lecture.lecture.getStartdate()) - .toString()); client.writeLecturedata( Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), @@ -414,6 +413,9 @@ public class CreateLectureLink_GUI extends JFrame { "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } con.closeThriftConnection(); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java new file mode 100644 index 00000000..57d36515 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -0,0 +1,454 @@ +package gui.lecture; + +import gui.intro.MainMenue_GUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Iterator; +import java.util.List; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +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; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.RowFilter; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import models.person; +import org.apache.thrift.TException; +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class DeleteLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JTable tableAllLectures; + JTable tablemyLectures; + JTable tableCoopImages; + JTable tablePublicVorlagen; + JTable tablePublicImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles = { "Veranstaltungsname", "Beschreibung", + "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "Verantwortlicher", "Image", "Schlagwort", "ID" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( + modelAll); + final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( + modelMyLectures); + private JButton button; + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public DeleteLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); + System.exit(0); + } + }); + // Verhindert das Vergrößern Des Fensters + setResizable(false); + + try { + // 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 + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung l\u00F6schen"); + // Zentriert das Fenster in die Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + final DefaultTableModel model = new DefaultTableModel(titles, 0); + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel( + "Zu l\u00F6schende Veranstaltung w\u00E4hlen"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie + .setText("W\u00E4hlen Sie bitte aus der unten stehenden Liste die zu l\u00F6schende Veranstaltung aus."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + 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.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); + + textFieldName = new JTextField(); + // 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)); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + + } + } + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "<html><u>Erweiterte Suche</u></html>"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Fenster Extended GUI + con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + es.setVisible(true); + } + }); + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + DeleteLecture_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("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 75, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(152, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl"); + lblNewLabel_1.setBounds(166, 11, 128, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + if (tabbedPane.getSelectedIndex() == 0) { + + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + username, 5)); + } else if (tabbedPane.getSelectedIndex() == 1) { + + } + + } + }); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + initTableModel(modelMyLectures); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllLectures = new JTable(); + tableAllLectures.setModel(modelAll); + tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyLectures = new JTable(); + tablemyLectures.setModel(modelMyLectures); + + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); + tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, + null); + tableAllLectures.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllLectures); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + tableCoopImages = new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Veranstaltungen", null, + scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + tablePublicImages = new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + tablePublicVorlagen = new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + + button = new JButton("L\u00F6schen"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + String lectureID=""; + int eingabe; + + //check if a row is selected + if (tablemyLectures.getSelectedRowCount() !=0){ + //a row is selected + //ask for confirmation + eingabe = JOptionPane.showConfirmDialog(null, + "Wollen Sie diese Daten löschen?", "Löschen?", + JOptionPane.YES_NO_OPTION); + + if (eingabe == JOptionPane.YES_OPTION) { + //user has confirmed deletion, now get the ID of the selected lecture + lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); + System.out.println("Lösche Lecture "+lectureID); + try { + if(client.deleteLecture(lectureID)){ + System.out.println("Löschen erfolgreich"); + //delete successful + con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); + dl.setVisible(true); + dispose(); + } else { + //delete not successful + JOptionPane + .showMessageDialog( + null, + "Löschen aus Datenbank fehlgeschlagen.", + "Fehler", + JOptionPane.INFORMATION_MESSAGE); + } + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + }//end delete + }//end ask for confirmation + + }//end check if a row is selected + + } + }); + button.setBounds(459, 508, 118, 23); + contentPanel.add(button); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton btnBack = new JButton("Zur\u00FCck"); + btnBack.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + btnBack.setActionCommand("OK"); + buttonPane.add(btnBack); + getRootPane().setDefaultButton(btnBack); + } + } + + 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) { + List<server.Lecture> lectures; + try { + // Hole eine Liste der Images + lectures = client.getLectureList(); + Iterator<server.Lecture> i = lectures.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { + lectures.get(x).lecturename, + lectures.get(x).desc, + lectures.get(x).starttime + " " + + lectures.get(x).endtime, + lectures.get(x).isActive, lectures.get(x).lastused, + lectures.get(x).username, " ", + lectures.get(x).imagename, lectures.get(x).id }; + // Füge diese Objekte der Tabelle hinzu + model.addRow(obj); + x++; + i.next(); + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } +} diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 115a9f1f..348b1c77 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -90,7 +90,7 @@ public class EditLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index c1fdec80..4160f855 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -99,7 +99,7 @@ public class EditLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 603) / 2; int left = (screenSize.width - 722) / 2; @@ -117,7 +117,7 @@ public class EditLectureLink_GUI extends JFrame { panel.setLayout(null); { JLabel lblNewLabel = new JLabel( - "Image zur Verlinkung ausw\u00E4hlen"); + "Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -370,14 +370,10 @@ public class EditLectureLink_GUI extends JFrame { String imagename = tableAllImages.getValueAt( tableAllImages.getSelectedRow(), 0) .toString(); - System.out.println("ID: "+Lecture.lecture.getid()); try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - System.out.println( formatter.format( - Lecture.lecture.getEnddate()) - .toString()); client.updateLecturedata(Lecture.lecture.getName(), Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index ae50fa22..badcf86a 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -1,6 +1,5 @@ package gui.lecture; -import gui.image.EditImageAllgemein_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; import java.awt.Dimension; @@ -116,7 +115,7 @@ public class EditLectureSearch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -240,7 +239,6 @@ public class EditLectureSearch_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " @@ -353,19 +351,6 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnContinue = new JButton("Weiter"); btnContinue.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - System.out - .println("\ntableAllImages.getSelectedRow() = " - + tableAllLectures.getSelectedRow() - + "\ntablemyImages.getSelectedRow() = " - + tablemyLectures.getSelectedRow() - + "\ntableCoopImages.getSelectedRow() = " - + tableCoopImages.getSelectedRow() - + "\ntablePublicImages.getSelectedRow() = " - + tablePublicImages.getSelectedRow() - + "\ntablePublicVorlagen.getSelectedRow() = " - + tablePublicVorlagen.getSelectedRow()); - // check if a row is selected if ((tableAllLectures.getSelectedRow() != -1) || (tablemyLectures.getSelectedRow() != -1) diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 3fc4b7f6..095ca7ef 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -72,7 +72,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Erweiterte Suche"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width -603) / 2; diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java new file mode 100644 index 00000000..413f1084 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -0,0 +1,404 @@ +package gui.lecture; + +import gui.intro.MainMenue_GUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Iterator; +import java.util.List; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.RowFilter; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import models.person; +import org.apache.thrift.TException; +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JTable tableAllLectures; + JTable tablemyLectures; + JTable tableCoopImages; + JTable tablePublicVorlagen; + JTable tablePublicImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles = { "Veranstaltungsname", "Beschreibung", + "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "Verantwortlicher", "Image", "Schlagwort", "ID" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( + modelAll); + final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( + modelMyLectures); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); + System.exit(0); + } + }); + // Verhindert das Vergrößern Des Fensters + setResizable(false); + + try { + // 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 + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen"); + // Zentriert das Fenster in die Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + final DefaultTableModel model = new DefaultTableModel(titles, 0); + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Suche nach Veranstaltung"); + lblNewLabel.setBounds(10, 11, 509, 22); + 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.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + 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.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); + + textFieldName = new JTextField(); + // 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)); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + + } + } + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "<html><u>Erweiterte Suche</u></html>"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Fenster Extended GUI + con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + es.setVisible(true); + } + }); + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + SearchLecture_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("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 75, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(152, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl"); + lblNewLabel_1.setBounds(166, 11, 128, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + if (tabbedPane.getSelectedIndex() == 0) { + + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + username, 5)); + } else if (tabbedPane.getSelectedIndex() == 1) { + + } + + } + }); + + tabbedPane.setBounds(10, 197, 557, 323); + contentPanel.add(tabbedPane); + initTableModel(modelMyLectures); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllLectures = new JTable(); + tableAllLectures.setModel(modelAll); + tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyLectures = new JTable(); + tablemyLectures.setModel(modelMyLectures); + + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); + tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, + null); + tableAllLectures.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllLectures); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + tableCoopImages = new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Veranstaltungen", null, + scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + tablePublicImages = new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + tablePublicVorlagen = new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton btnBack = new JButton("Zur\u00FCck"); + btnBack.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + btnBack.setActionCommand("OK"); + buttonPane.add(btnBack); + getRootPane().setDefaultButton(btnBack); + } + } + + 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) { + List<server.Lecture> lectures; + try { + // Hole eine Liste der Images + lectures = client.getLectureList(); + Iterator<server.Lecture> i = lectures.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { + lectures.get(x).lecturename, + lectures.get(x).desc, + lectures.get(x).starttime + " " + + lectures.get(x).endtime, + lectures.get(x).isActive, lectures.get(x).lastused, + lectures.get(x).username, " ", + lectures.get(x).imagename, lectures.get(x).id }; + // Füge diese Objekte der Tabelle hinzu + model.addRow(obj); + x++; + i.next(); + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + +} diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index 24ab16f3..435f3c1d 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -3,7 +3,9 @@ package models; public class person{ + private String username; + private String Name; private String Vorname; private String Hochschule; @@ -13,6 +15,11 @@ public class person{ private boolean ischecked; + + public static person verantowrtlicher=new person(); + public static person ersteller=new person(); + + public static person verantwortlicher=new person(); @@ -22,6 +29,7 @@ public class person{ public void setUsername(String username) { this.username = username; } + public String getName() { return Name; } diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index ecbc689c..24d034f2 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -1,5 +1,7 @@ package thrift; +import javax.swing.JOptionPane; + import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; @@ -11,7 +13,10 @@ import thrift.ImageServer.Client; public class MasterThriftConnection { - final TTransport transport = new TSocket("132.230.4.16", 9090); + + public static final String MASTERSERVERIP="132.230.4.16"; + final TTransport transport = new TSocket(MASTERSERVERIP, 9090); + public Client getMasterThriftConnection() { @@ -19,14 +24,15 @@ public class MasterThriftConnection { transport.open(); } catch (TTransportException e) { System.out.println("Keine Verbindung möglich!"); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return null; } final TProtocol protocol = new TBinaryProtocol(transport); final Client client = new Client(protocol); - - - System.out.println("Der Server läuft!"); + System.out.println("Masterserver erreichbar."); return client; } diff --git a/Dozentenmodul/src/thrift/SessionData.java b/Dozentenmodul/src/thrift/SessionData.java index 51f0f80b..f754ecb3 100644 --- a/Dozentenmodul/src/thrift/SessionData.java +++ b/Dozentenmodul/src/thrift/SessionData.java @@ -29,6 +29,9 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; + +import javax.swing.JOptionPane; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -442,6 +445,9 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session try { write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); } catch (org.apache.thrift.TException te) { + JOptionPane.showMessageDialog(null, + te.getCause()+"\n"+te.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); throw new java.io.IOException(te); } } @@ -450,6 +456,9 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { + JOptionPane.showMessageDialog(null, + te.getCause()+"\n"+te.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); throw new java.io.IOException(te); } } diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 311125f5..7652fbe7 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -1,5 +1,9 @@ package thrift; +import javax.swing.JOptionPane; + +import models.SessionData; + import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; @@ -10,23 +14,28 @@ import server.Server; import server.Server.Client; public class ThriftConnection { - //final TTransport transport = new TSocket("141.79.128.121", 9090); - final TTransport transport = new TSocket("141.79.128.102", 9090); + + private String satAddress = ""+SessionData.session.getServerAdress(); + final TTransport transport = new TSocket(satAddress, 9090); + //final TTransport transport = new TSocket("141.79.128.102", 9090); public Client getThriftConnection() { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich!"); + System.out.println("Keine Verbindung möglich! Satellit="+satAddress); + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); + //System.out.println("Keine Verbindung möglich! Satellit="); return null; } final TProtocol protocol = new TBinaryProtocol(transport); final Server.Client client = new Server.Client(protocol); - - - System.out.println("Verbindung wurde aufgebaut."); + System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); return client; } |