diff options
375 files changed, 5701 insertions, 696 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; } diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class Binary files differindex d53cdc9d..4a135f2d 100644 --- a/Dozentenmodulserver/bin/server/BinaryListener.class +++ b/Dozentenmodulserver/bin/server/BinaryListener.class diff --git a/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class b/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class Binary files differdeleted file mode 100644 index d2e80220..00000000 --- a/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class Binary files differdeleted file mode 100644 index da393159..00000000 --- a/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class b/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class Binary files differdeleted file mode 100644 index 63fdf940..00000000 --- a/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class Binary files differdeleted file mode 100644 index ae9305a5..00000000 --- a/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Image$_Fields.class b/Dozentenmodulserver/bin/server/Image$_Fields.class Binary files differdeleted file mode 100644 index 1a5f4454..00000000 --- a/Dozentenmodulserver/bin/server/Image$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Image.class b/Dozentenmodulserver/bin/server/Image.class Binary files differdeleted file mode 100644 index 4aed38be..00000000 --- a/Dozentenmodulserver/bin/server/Image.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class b/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class Binary files differdeleted file mode 100644 index 9a345304..00000000 --- a/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class Binary files differdeleted file mode 100644 index 8f40c279..00000000 --- a/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class b/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class Binary files differdeleted file mode 100644 index 8cd68eca..00000000 --- a/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class Binary files differdeleted file mode 100644 index a0ac20fb..00000000 --- a/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture$_Fields.class b/Dozentenmodulserver/bin/server/Lecture$_Fields.class Binary files differdeleted file mode 100644 index e1ec6923..00000000 --- a/Dozentenmodulserver/bin/server/Lecture$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Lecture.class b/Dozentenmodulserver/bin/server/Lecture.class Binary files differdeleted file mode 100644 index 8d3c743c..00000000 --- a/Dozentenmodulserver/bin/server/Lecture.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class Binary files differindex b9f7aece..8dfc3bb5 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class Binary files differindex 3a6ee149..2d3d594c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class Binary files differindex ad446096..8fef909a 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class Binary files differindex a81b124d..c68e6ef2 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class Binary files differindex b41f875f..52df777d 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class Binary files differindex 9443b61d..aa0a9cfc 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class Binary files differindex f14b4b88..1b0543f6 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class Binary files differindex f5fea364..58cf5620 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class Binary files differindex 15a7e64d..b0af62f0 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class Binary files differindex e73d9eb7..4132d052 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class Binary files differindex 5706d84c..aee4a506 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class Binary files differindex f40d9576..e849b2c9 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class Binary files differindex 45e8818b..df47e127 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class Binary files differindex 0b9b8080..8900f509 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class Binary files differindex be6be8d5..6892e6c3 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class Binary files differindex 041bd939..82a8ffc6 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncIface.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncIface.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class Binary files differdeleted file mode 100644 index f05ef213..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class Binary files differindex 41c2b398..b87d4ed6 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class Binary files differdeleted file mode 100644 index c0839a71..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class Binary files differindex 7b5efda9..9370eaee 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class Binary files differdeleted file mode 100644 index fd02459a..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class Binary files differindex 8866aa8c..c4efc823 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class Binary files differdeleted file mode 100644 index 2adfcfd3..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class Binary files differindex 052e5183..b7694846 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class Binary files differdeleted file mode 100644 index efc7db7a..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class Binary files differindex b12eb26a..f99560c5 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class Binary files differdeleted file mode 100644 index 3199ecc8..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class Binary files differindex a3be493f..13843ecd 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class Binary files differdeleted file mode 100644 index 26f60b44..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class Binary files differindex e32bc932..3d8e7bff 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class Binary files differdeleted file mode 100644 index e052fa81..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class Binary files differindex 49e23bb5..1258154c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class Binary files differdeleted file mode 100644 index 7e31f5f6..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class Binary files differindex 7479a47e..92958816 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class Binary files differdeleted file mode 100644 index e7028bc8..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class Binary files differindex 58c78735..84739a96 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class Binary files differdeleted file mode 100644 index ce2fbdaf..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class Binary files differindex 6a24d4f3..28af6c97 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class Binary files differdeleted file mode 100644 index e7a2b18a..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class Binary files differindex 8cc6545f..59b2809e 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class Binary files differdeleted file mode 100644 index d3005b35..00000000 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class Binary files differindex 96b2083f..9f70a76a 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class Binary files differindex ddd24f66..8ec1b5a8 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class diff --git a/Dozentenmodulserver/bin/server/Server$Client$Factory.class b/Dozentenmodulserver/bin/server/Server$Client$Factory.class Binary files differindex 24cca88c..853c4e4f 100644 --- a/Dozentenmodulserver/bin/server/Server$Client$Factory.class +++ b/Dozentenmodulserver/bin/server/Server$Client$Factory.class diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class Binary files differindex d138733d..c08af073 100644 --- a/Dozentenmodulserver/bin/server/Server$Client.class +++ b/Dozentenmodulserver/bin/server/Server$Client.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class Binary files differindex 0ac8e25a..167c8648 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class Binary files differindex f64ceb22..e158c899 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class Binary files differindex d34a3316..9c53ef06 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class Binary files differindex eac18f6d..91b8bea8 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class Binary files differindex b2d4175d..c8bbc8a7 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class Binary files differindex ab5fb30a..d40c5b30 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class Binary files differindex ddf26e52..ea79d4c8 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class Binary files differindex 9a53fe08..27d1ef2b 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class Binary files differindex 00a8eb2b..d3db179a 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class Binary files differindex 1ddecd68..774be454 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class Binary files differindex 02524b76..71af0f92 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class Binary files differindex 4cad3c82..8113fbaf 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class Binary files differindex 78cd8be5..afebb403 100644 --- a/Dozentenmodulserver/bin/server/Server$Iface.class +++ b/Dozentenmodulserver/bin/server/Server$Iface.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class Binary files differindex 810f02a6..33dcc8a3 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class Binary files differindex 2ab05339..60d6c0b8 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class Binary files differindex 621a3e04..d916c517 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class Binary files differindex 9af46fba..849e7a22 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class Binary files differindex baabb6a2..b94e0ecf 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class Binary files differindex 9ef5348a..485765a0 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class Binary files differindex 84f355f6..eeba0c8a 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class Binary files differindex 940e9424..a2250f47 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class Binary files differindex 2a4d2d05..25df5432 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class Binary files differindex 3271e7b7..3a4f8f0d 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class Binary files differindex 76a62c71..6c73bf78 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class Binary files differindex 1ff6a12a..7677e83f 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class Binary files differindex ffc95d27..b5eb6895 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class Binary files differindex 42a0a279..4b4f701c 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor.class +++ b/Dozentenmodulserver/bin/server/Server$Processor.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class Binary files differindex 29a348c1..3fd61db0 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class Binary files differindex afac26c7..c719992a 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class Binary files differindex 124a613e..d728a9a0 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class Binary files differindex 677c9ab2..cf36028c 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class Binary files differindex 8f24da32..1fee6465 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class Binary files differindex 0657e6a1..e4ff06bb 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class Binary files differindex c36806a9..53fb4fdf 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class Binary files differindex ffd7bd58..bd9fbc4c 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class Binary files differindex 0e6a86b6..c7f67b03 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class Binary files differindex fe540f6a..1b8f7a3f 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class Binary files differindex 4f3fecc8..eb2d1331 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class Binary files differindex cd8b23b0..44b53f49 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class Binary files differindex d4847279..33ccc61e 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class Binary files differindex 84af7916..0a3e615b 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class Binary files differindex 05c85c60..c84e8ba3 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class Binary files differindex 22c4aba1..90901a90 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class Binary files differindex 2d953509..7badb27e 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class Binary files differindex 66f5aaaa..ef4e1e3e 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class Binary files differindex 6f86e39f..d2cd2f01 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class Binary files differindex 35a2154e..ec24272b 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class Binary files differindex f6c36954..5fb2eba8 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class Binary files differindex 2e0d9e4b..6af0f321 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class Binary files differindex f5403647..db472ea2 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class Binary files differindex 7d669976..f628c4af 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class Binary files differindex 6368703f..206427a3 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class Binary files differindex 5219ac71..f4657696 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class Binary files differindex 76025f2a..71254e5b 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class Binary files differindex 72489263..5ba4b171 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class Binary files differindex d22f3e08..f851a5af 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class Binary files differindex f26a5cb4..0621b481 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class Binary files differindex cae43275..757cee72 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class Binary files differindex 67f53c44..df01cbda 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class Binary files differindex 40a59907..8a9cc6ec 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class Binary files differindex ac192466..a0752970 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class Binary files differindex cebad682..80d99cc3 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class Binary files differindex df47fb85..f4a2a341 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class Binary files differindex 639a5d48..d7454c69 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class Binary files differindex fdcd61bf..8e0b70a7 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class Binary files differindex 72f11f08..99f161c8 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class Binary files differindex 64537d12..12b59fee 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class Binary files differindex 97399865..873befa0 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class Binary files differindex 84c82c2c..676ab0fe 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class Binary files differindex 60f37666..b06f283d 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class Binary files differindex e55b5484..4203b887 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class Binary files differindex 23d5421f..eb90e829 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class Binary files differindex 8c92c9b0..6ad1a6e4 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class Binary files differindex ac540e16..4aa8b01a 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class Binary files differindex 0eb17fa2..b7094af7 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class Binary files differindex 55f3041b..d6451740 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class Binary files differindex b1c4d1c3..68dad08d 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class Binary files differindex beb781e8..1a39c663 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class Binary files differindex c8506bd2..d7df9e4e 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class Binary files differindex 65b48e26..115e185a 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class Binary files differindex aab8f100..34640c45 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class Binary files differindex faf631f8..38f2c171 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class Binary files differindex 05dbb134..763942ee 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class Binary files differindex c7e92e00..9f62d5e3 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class Binary files differindex f17e4a83..49ad4e22 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class Binary files differindex 9540d300..619302dc 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class Binary files differindex 25e880a9..0880c4d4 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class Binary files differindex 451f34e4..a4aa01d7 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class Binary files differindex d028e4f7..add24793 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class Binary files differindex d01f0951..79181f59 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class Binary files differindex a61a916e..c8184285 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class Binary files differindex 34b83306..0a956fdc 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class Binary files differindex 1c32e854..a56c60e4 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class Binary files differindex fa941650..43510383 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class Binary files differindex 1e5871c7..983d9fcc 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class Binary files differindex f44743fb..18a6654f 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class Binary files differindex a493e06d..2bc46013 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class Binary files differindex 8f34b0ca..e2d9f4c3 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class Binary files differindex 7541df8c..e3ae6197 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class Binary files differindex f5698a5d..696ca397 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class Binary files differindex e89140d8..c0d338de 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class Binary files differindex 58726357..f4963855 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class Binary files differindex 6c6a3191..6c54d937 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class Binary files differindex 22f6b508..977f1229 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class Binary files differindex c1951807..f9c3590a 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class Binary files differindex 152f4c5a..b1cbc9ca 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class Binary files differindex a53bbab2..ca631ae4 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class Binary files differindex 9a20fb03..8110b923 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class Binary files differindex 713c68b5..3b0c079f 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class Binary files differindex a1a85270..368a7d41 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class Binary files differindex 97dea6f5..501a0f9f 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class Binary files differindex bb6f6aad..1c14c879 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class Binary files differindex a93585e5..d484ff48 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class Binary files differindex edf3ffe2..5a921ded 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class Binary files differindex c5f114a4..6dafe76d 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class Binary files differindex 47a5dc7d..19803a11 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class Binary files differindex 1ed68869..12fae202 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class Binary files differindex 96d2ff40..bc203edb 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class Binary files differindex 6323e7ac..b44eca0b 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class Binary files differindex 5041b018..487b3305 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class Binary files differindex 17932022..92c8bd4c 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class Binary files differindex c76e8e24..664a3da9 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class Binary files differindex 2686ad7c..a592a387 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class Binary files differindex 0fb16721..700dab4c 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class Binary files differindex 59551a4d..1eb28ae7 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class Binary files differindex d31c4883..98ad9bdc 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class Binary files differindex 49025877..00adddd1 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class Binary files differindex aa11dead..50866f08 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class Binary files differindex 700714bb..c5438162 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class Binary files differindex fa309bc2..898251ad 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class Binary files differindex 5e8ba644..d484c52a 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class Binary files differindex c1af033f..ed1b7150 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class Binary files differindex 03231ba0..1a618f09 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class Binary files differindex e53d067e..fe53acdd 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class Binary files differindex 6151ec42..25fa2380 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class Binary files differindex 1faa1485..a58009e8 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class Binary files differindex a61d1eb5..88ea5dfb 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class Binary files differindex 4c9cd562..813f82f9 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class Binary files differindex 9a82bd9f..4051e85a 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class Binary files differindex 6b16e8ed..e92eb408 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class Binary files differindex f194e0a8..c169350e 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class Binary files differindex 9d7dc8b6..8caf1fa4 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class Binary files differindex 5bbeee9c..6641f027 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class Binary files differindex 7008f4c1..a7ee760b 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class Binary files differindex 546e9d31..14337011 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class Binary files differindex 21a25f2f..6be2e9f8 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class Binary files differindex 8a97f8f6..49ae7be3 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class Binary files differindex 1ed33177..794fd93d 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class Binary files differindex 20f9457f..ea3e42fa 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class Binary files differindex 95b5cdca..5d2488bb 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class Binary files differindex 3e9cd2f2..98a3394d 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class Binary files differindex af7ce74c..1ca0ea2f 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class Binary files differindex 76c16884..08793030 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class Binary files differindex 340cbf7c..23dd935b 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class Binary files differindex a188ae52..a411d5be 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class Binary files differindex b1c2e7c2..9d0aa481 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class Binary files differindex fdd5fc41..2fed0f27 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class Binary files differindex fa139335..79ca6df4 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class Binary files differindex 3a46b9bf..0ca4d2dd 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class Binary files differindex 00319583..2da98828 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class Binary files differindex 8d8ae69e..974ddd21 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class Binary files differindex 078f124c..9d610983 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class Binary files differindex 025c8784..2f053da1 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class Binary files differindex ff9d84ea..12b39de7 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class Binary files differindex 2f77765d..0d527018 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class Binary files differindex 24a2638c..10123428 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class Binary files differindex 78eee47a..97d65475 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class Binary files differindex 127d594e..df9e6478 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class Binary files differindex 57cccffb..bcce57d7 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class Binary files differindex 5aca0d63..98580986 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class Binary files differindex 76e21904..db6fcd61 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class diff --git a/Dozentenmodulserver/bin/server/Server.class b/Dozentenmodulserver/bin/server/Server.class Binary files differindex 91c713d5..4df80d9c 100644 --- a/Dozentenmodulserver/bin/server/Server.class +++ b/Dozentenmodulserver/bin/server/Server.class diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differindex 7288e8e3..5ad3583e 100644 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ b/Dozentenmodulserver/bin/server/ServerHandler.class diff --git a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class Binary files differdeleted file mode 100644 index cf96c062..00000000 --- a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class Binary files differdeleted file mode 100644 index a409161e..00000000 --- a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class Binary files differdeleted file mode 100644 index 1eea1bb0..00000000 --- a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class Binary files differdeleted file mode 100644 index c76c48fe..00000000 --- a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/User$_Fields.class b/Dozentenmodulserver/bin/server/User$_Fields.class Binary files differdeleted file mode 100644 index 191396fc..00000000 --- a/Dozentenmodulserver/bin/server/User$_Fields.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/User.class b/Dozentenmodulserver/bin/server/User.class Binary files differdeleted file mode 100644 index e76e61f2..00000000 --- a/Dozentenmodulserver/bin/server/User.class +++ /dev/null diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class Binary files differindex 030b565e..14dc0861 100644 --- a/Dozentenmodulserver/bin/server/startServer.class +++ b/Dozentenmodulserver/bin/server/startServer.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex 6a4524b7..6187791d 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index 8d592992..97793778 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -28,7 +28,7 @@ public class BinaryListener implements Runnable return; } TServer server = new TSimpleServer( new Args( transport ).processor( processor ) ); - log.info(new Date() +" - Started Running Server"); + log.info(new Date() +" - Started running BinaryListener"); server.serve(); } diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index d3e256df..fac89b2c 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -62,8 +62,16 @@ public class Server { public Map<String,String> getLectureData(String lecturename) throws org.apache.thrift.TException; + public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException; + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException; + public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException; + + public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException; + + public boolean deleteLecture(String id) throws org.apache.thrift.TException; + } public interface AsyncIface { @@ -94,8 +102,16 @@ public class Server { public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void deleteLecture(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + } public static class Client extends org.apache.thrift.TServiceClient implements Iface { @@ -446,6 +462,30 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result"); } + public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException + { + send_deleteImageData(id, version); + return recv_deleteImageData(); + } + + public void send_deleteImageData(String id, String version) throws org.apache.thrift.TException + { + deleteImageData_args args = new deleteImageData_args(); + args.setId(id); + args.setVersion(version); + sendBase("deleteImageData", args); + } + + public boolean recv_deleteImageData() throws org.apache.thrift.TException + { + deleteImageData_result result = new deleteImageData_result(); + receiveBase(result, "deleteImageData"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageData failed: unknown result"); + } + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException { send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id); @@ -483,6 +523,77 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result"); } + public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException + { + send_deleteImageServer(id, version); + return recv_deleteImageServer(); + } + + public void send_deleteImageServer(String id, String version) throws org.apache.thrift.TException + { + deleteImageServer_args args = new deleteImageServer_args(); + args.setId(id); + args.setVersion(version); + sendBase("deleteImageServer", args); + } + + public boolean recv_deleteImageServer() throws org.apache.thrift.TException + { + deleteImageServer_result result = new deleteImageServer_result(); + receiveBase(result, "deleteImageServer"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageServer failed: unknown result"); + } + + public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException + { + send_connectedToLecture(id, version); + return recv_connectedToLecture(); + } + + public void send_connectedToLecture(String id, String version) throws org.apache.thrift.TException + { + connectedToLecture_args args = new connectedToLecture_args(); + args.setId(id); + args.setVersion(version); + sendBase("connectedToLecture", args); + } + + public boolean recv_connectedToLecture() throws org.apache.thrift.TException + { + connectedToLecture_result result = new connectedToLecture_result(); + receiveBase(result, "connectedToLecture"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "connectedToLecture failed: unknown result"); + } + + public boolean deleteLecture(String id) throws org.apache.thrift.TException + { + send_deleteLecture(id); + return recv_deleteLecture(); + } + + public void send_deleteLecture(String id) throws org.apache.thrift.TException + { + deleteLecture_args args = new deleteLecture_args(); + args.setId(id); + sendBase("deleteLecture", args); + } + + public boolean recv_deleteLecture() throws org.apache.thrift.TException + { + deleteLecture_result result = new deleteLecture_result(); + receiveBase(result, "deleteLecture"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteLecture failed: unknown result"); + } + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> { @@ -1004,6 +1115,41 @@ public class Server { } } + public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + deleteImageData_call method_call = new deleteImageData_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class deleteImageData_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + private String version; + public deleteImageData_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + this.version = version; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteImageData", org.apache.thrift.protocol.TMessageType.CALL, 0)); + deleteImageData_args args = new deleteImageData_args(); + args.setId(id); + args.setVersion(version); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_deleteImageData(); + } + } + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); updateLecturedata_call method_call = new updateLecturedata_call(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id, resultHandler, this, ___protocolFactory, ___transport); @@ -1078,6 +1224,108 @@ public class Server { } } + public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + deleteImageServer_call method_call = new deleteImageServer_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class deleteImageServer_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + private String version; + public deleteImageServer_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + this.version = version; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteImageServer", org.apache.thrift.protocol.TMessageType.CALL, 0)); + deleteImageServer_args args = new deleteImageServer_args(); + args.setId(id); + args.setVersion(version); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_deleteImageServer(); + } + } + + public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + connectedToLecture_call method_call = new connectedToLecture_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class connectedToLecture_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + private String version; + public connectedToLecture_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + this.version = version; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("connectedToLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); + connectedToLecture_args args = new connectedToLecture_args(); + args.setId(id); + args.setVersion(version); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_connectedToLecture(); + } + } + + public void deleteLecture(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + deleteLecture_call method_call = new deleteLecture_call(id, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + public deleteLecture_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); + deleteLecture_args args = new deleteLecture_args(); + args.setId(id); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_deleteLecture(); + } + } + } public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor { @@ -1104,7 +1352,11 @@ public class Server { processMap.put("getImageData", new getImageData()); processMap.put("updateImageData", new updateImageData()); processMap.put("getLectureData", new getLectureData()); + processMap.put("deleteImageData", new deleteImageData()); processMap.put("updateLecturedata", new updateLecturedata()); + processMap.put("deleteImageServer", new deleteImageServer()); + processMap.put("connectedToLecture", new connectedToLecture()); + processMap.put("deleteLecture", new deleteLecture()); return processMap; } @@ -1373,6 +1625,27 @@ public class Server { } } + public static class deleteImageData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteImageData_args> { + public deleteImageData() { + super("deleteImageData"); + } + + public deleteImageData_args getEmptyArgsInstance() { + return new deleteImageData_args(); + } + + protected boolean isOneway() { + return false; + } + + public deleteImageData_result getResult(I iface, deleteImageData_args args) throws org.apache.thrift.TException { + deleteImageData_result result = new deleteImageData_result(); + result.success = iface.deleteImageData(args.id, args.version); + result.setSuccessIsSet(true); + return result; + } + } + public static class updateLecturedata<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateLecturedata_args> { public updateLecturedata() { super("updateLecturedata"); @@ -1394,6 +1667,69 @@ public class Server { } } + public static class deleteImageServer<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteImageServer_args> { + public deleteImageServer() { + super("deleteImageServer"); + } + + public deleteImageServer_args getEmptyArgsInstance() { + return new deleteImageServer_args(); + } + + protected boolean isOneway() { + return false; + } + + public deleteImageServer_result getResult(I iface, deleteImageServer_args args) throws org.apache.thrift.TException { + deleteImageServer_result result = new deleteImageServer_result(); + result.success = iface.deleteImageServer(args.id, args.version); + result.setSuccessIsSet(true); + return result; + } + } + + public static class connectedToLecture<I extends Iface> extends org.apache.thrift.ProcessFunction<I, connectedToLecture_args> { + public connectedToLecture() { + super("connectedToLecture"); + } + + public connectedToLecture_args getEmptyArgsInstance() { + return new connectedToLecture_args(); + } + + protected boolean isOneway() { + return false; + } + + public connectedToLecture_result getResult(I iface, connectedToLecture_args args) throws org.apache.thrift.TException { + connectedToLecture_result result = new connectedToLecture_result(); + result.success = iface.connectedToLecture(args.id, args.version); + result.setSuccessIsSet(true); + return result; + } + } + + public static class deleteLecture<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteLecture_args> { + public deleteLecture() { + super("deleteLecture"); + } + + public deleteLecture_args getEmptyArgsInstance() { + return new deleteLecture_args(); + } + + protected boolean isOneway() { + return false; + } + + public deleteLecture_result getResult(I iface, deleteLecture_args args) throws org.apache.thrift.TException { + deleteLecture_result result = new deleteLecture_result(); + result.success = iface.deleteLecture(args.id); + result.setSuccessIsSet(true); + return result; + } + } + } public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> { @@ -1420,7 +1756,11 @@ public class Server { processMap.put("getImageData", new getImageData()); processMap.put("updateImageData", new updateImageData()); processMap.put("getLectureData", new getLectureData()); + processMap.put("deleteImageData", new deleteImageData()); processMap.put("updateLecturedata", new updateLecturedata()); + processMap.put("deleteImageServer", new deleteImageServer()); + processMap.put("connectedToLecture", new connectedToLecture()); + processMap.put("deleteLecture", new deleteLecture()); return processMap; } @@ -2092,6 +2432,58 @@ public class Server { } } + public static class deleteImageData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteImageData_args, Boolean> { + public deleteImageData() { + super("deleteImageData"); + } + + public deleteImageData_args getEmptyArgsInstance() { + return new deleteImageData_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + deleteImageData_result result = new deleteImageData_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + deleteImageData_result result = new deleteImageData_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, deleteImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.deleteImageData(args.id, args.version,resultHandler); + } + } + public static class updateLecturedata<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateLecturedata_args, Boolean> { public updateLecturedata() { super("updateLecturedata"); @@ -2144,6 +2536,162 @@ public class Server { } } + public static class deleteImageServer<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteImageServer_args, Boolean> { + public deleteImageServer() { + super("deleteImageServer"); + } + + public deleteImageServer_args getEmptyArgsInstance() { + return new deleteImageServer_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + deleteImageServer_result result = new deleteImageServer_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + deleteImageServer_result result = new deleteImageServer_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, deleteImageServer_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.deleteImageServer(args.id, args.version,resultHandler); + } + } + + public static class connectedToLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, connectedToLecture_args, Boolean> { + public connectedToLecture() { + super("connectedToLecture"); + } + + public connectedToLecture_args getEmptyArgsInstance() { + return new connectedToLecture_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + connectedToLecture_result result = new connectedToLecture_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + connectedToLecture_result result = new connectedToLecture_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, connectedToLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.connectedToLecture(args.id, args.version,resultHandler); + } + } + + public static class deleteLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteLecture_args, Boolean> { + public deleteLecture() { + super("deleteLecture"); + } + + public deleteLecture_args getEmptyArgsInstance() { + return new deleteLecture_args(); + } + + public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback<Boolean>() { + public void onComplete(Boolean o) { + deleteLecture_result result = new deleteLecture_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + deleteLecture_result result = new deleteLecture_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { + iface.deleteLecture(args.id,resultHandler); + } + } + } public static class getFtpUser_args implements org.apache.thrift.TBase<getFtpUser_args, getFtpUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<getFtpUser_args> { @@ -14494,6 +15042,814 @@ public class Server { } + public static class deleteImageData_args implements org.apache.thrift.TBase<deleteImageData_args, deleteImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageData_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageData_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteImageData_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteImageData_argsTupleSchemeFactory()); + } + + public String id; // required + public String version; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"), + VERSION((short)-2, "version"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + case -2: // VERSION + return VERSION; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageData_args.class, metaDataMap); + } + + public deleteImageData_args() { + } + + public deleteImageData_args( + String id, + String version) + { + this(); + this.id = id; + this.version = version; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteImageData_args(deleteImageData_args other) { + if (other.isSetId()) { + this.id = other.id; + } + if (other.isSetVersion()) { + this.version = other.version; + } + } + + public deleteImageData_args deepCopy() { + return new deleteImageData_args(this); + } + + @Override + public void clear() { + this.id = null; + this.version = null; + } + + public String getId() { + return this.id; + } + + public deleteImageData_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public String getVersion() { + return this.version; + } + + public deleteImageData_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + case VERSION: + return getVersion(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + case VERSION: + return isSetVersion(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteImageData_args) + return this.equals((deleteImageData_args)that); + return false; + } + + public boolean equals(deleteImageData_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteImageData_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteImageData_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteImageData_argsStandardSchemeFactory implements SchemeFactory { + public deleteImageData_argsStandardScheme getScheme() { + return new deleteImageData_argsStandardScheme(); + } + } + + private static class deleteImageData_argsStandardScheme extends StandardScheme<deleteImageData_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageData_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageData_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteImageData_argsTupleSchemeFactory implements SchemeFactory { + public deleteImageData_argsTupleScheme getScheme() { + return new deleteImageData_argsTupleScheme(); + } + } + + private static class deleteImageData_argsTupleScheme extends TupleScheme<deleteImageData_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageData_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageData_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } + } + } + + } + + public static class deleteImageData_result implements org.apache.thrift.TBase<deleteImageData_result, deleteImageData_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageData_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageData_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteImageData_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteImageData_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageData_result.class, metaDataMap); + } + + public deleteImageData_result() { + } + + public deleteImageData_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteImageData_result(deleteImageData_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public deleteImageData_result deepCopy() { + return new deleteImageData_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public deleteImageData_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteImageData_result) + return this.equals((deleteImageData_result)that); + return false; + } + + public boolean equals(deleteImageData_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteImageData_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteImageData_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteImageData_resultStandardSchemeFactory implements SchemeFactory { + public deleteImageData_resultStandardScheme getScheme() { + return new deleteImageData_resultStandardScheme(); + } + } + + private static class deleteImageData_resultStandardScheme extends StandardScheme<deleteImageData_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageData_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageData_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteImageData_resultTupleSchemeFactory implements SchemeFactory { + public deleteImageData_resultTupleScheme getScheme() { + return new deleteImageData_resultTupleScheme(); + } + } + + private static class deleteImageData_resultTupleScheme extends TupleScheme<deleteImageData_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageData_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageData_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + public static class updateLecturedata_args implements org.apache.thrift.TBase<updateLecturedata_args, updateLecturedata_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateLecturedata_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateLecturedata_args"); @@ -16600,4 +17956,2328 @@ public class Server { } + public static class deleteImageServer_args implements org.apache.thrift.TBase<deleteImageServer_args, deleteImageServer_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageServer_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageServer_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteImageServer_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteImageServer_argsTupleSchemeFactory()); + } + + public String id; // required + public String version; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"), + VERSION((short)-2, "version"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + case -2: // VERSION + return VERSION; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageServer_args.class, metaDataMap); + } + + public deleteImageServer_args() { + } + + public deleteImageServer_args( + String id, + String version) + { + this(); + this.id = id; + this.version = version; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteImageServer_args(deleteImageServer_args other) { + if (other.isSetId()) { + this.id = other.id; + } + if (other.isSetVersion()) { + this.version = other.version; + } + } + + public deleteImageServer_args deepCopy() { + return new deleteImageServer_args(this); + } + + @Override + public void clear() { + this.id = null; + this.version = null; + } + + public String getId() { + return this.id; + } + + public deleteImageServer_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public String getVersion() { + return this.version; + } + + public deleteImageServer_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + case VERSION: + return getVersion(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + case VERSION: + return isSetVersion(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteImageServer_args) + return this.equals((deleteImageServer_args)that); + return false; + } + + public boolean equals(deleteImageServer_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteImageServer_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteImageServer_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteImageServer_argsStandardSchemeFactory implements SchemeFactory { + public deleteImageServer_argsStandardScheme getScheme() { + return new deleteImageServer_argsStandardScheme(); + } + } + + private static class deleteImageServer_argsStandardScheme extends StandardScheme<deleteImageServer_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageServer_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageServer_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteImageServer_argsTupleSchemeFactory implements SchemeFactory { + public deleteImageServer_argsTupleScheme getScheme() { + return new deleteImageServer_argsTupleScheme(); + } + } + + private static class deleteImageServer_argsTupleScheme extends TupleScheme<deleteImageServer_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageServer_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageServer_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } + } + } + + } + + public static class deleteImageServer_result implements org.apache.thrift.TBase<deleteImageServer_result, deleteImageServer_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageServer_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageServer_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteImageServer_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteImageServer_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageServer_result.class, metaDataMap); + } + + public deleteImageServer_result() { + } + + public deleteImageServer_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteImageServer_result(deleteImageServer_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public deleteImageServer_result deepCopy() { + return new deleteImageServer_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public deleteImageServer_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteImageServer_result) + return this.equals((deleteImageServer_result)that); + return false; + } + + public boolean equals(deleteImageServer_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteImageServer_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteImageServer_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteImageServer_resultStandardSchemeFactory implements SchemeFactory { + public deleteImageServer_resultStandardScheme getScheme() { + return new deleteImageServer_resultStandardScheme(); + } + } + + private static class deleteImageServer_resultStandardScheme extends StandardScheme<deleteImageServer_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageServer_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageServer_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteImageServer_resultTupleSchemeFactory implements SchemeFactory { + public deleteImageServer_resultTupleScheme getScheme() { + return new deleteImageServer_resultTupleScheme(); + } + } + + private static class deleteImageServer_resultTupleScheme extends TupleScheme<deleteImageServer_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageServer_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageServer_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + + public static class connectedToLecture_args implements org.apache.thrift.TBase<connectedToLecture_args, connectedToLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<connectedToLecture_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("connectedToLecture_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new connectedToLecture_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new connectedToLecture_argsTupleSchemeFactory()); + } + + public String id; // required + public String version; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"), + VERSION((short)-2, "version"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + case -2: // VERSION + return VERSION; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(connectedToLecture_args.class, metaDataMap); + } + + public connectedToLecture_args() { + } + + public connectedToLecture_args( + String id, + String version) + { + this(); + this.id = id; + this.version = version; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public connectedToLecture_args(connectedToLecture_args other) { + if (other.isSetId()) { + this.id = other.id; + } + if (other.isSetVersion()) { + this.version = other.version; + } + } + + public connectedToLecture_args deepCopy() { + return new connectedToLecture_args(this); + } + + @Override + public void clear() { + this.id = null; + this.version = null; + } + + public String getId() { + return this.id; + } + + public connectedToLecture_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public String getVersion() { + return this.version; + } + + public connectedToLecture_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + case VERSION: + return getVersion(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + case VERSION: + return isSetVersion(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof connectedToLecture_args) + return this.equals((connectedToLecture_args)that); + return false; + } + + public boolean equals(connectedToLecture_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(connectedToLecture_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("connectedToLecture_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class connectedToLecture_argsStandardSchemeFactory implements SchemeFactory { + public connectedToLecture_argsStandardScheme getScheme() { + return new connectedToLecture_argsStandardScheme(); + } + } + + private static class connectedToLecture_argsStandardScheme extends StandardScheme<connectedToLecture_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, connectedToLecture_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, connectedToLecture_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class connectedToLecture_argsTupleSchemeFactory implements SchemeFactory { + public connectedToLecture_argsTupleScheme getScheme() { + return new connectedToLecture_argsTupleScheme(); + } + } + + private static class connectedToLecture_argsTupleScheme extends TupleScheme<connectedToLecture_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } + } + } + + } + + public static class connectedToLecture_result implements org.apache.thrift.TBase<connectedToLecture_result, connectedToLecture_result._Fields>, java.io.Serializable, Cloneable, Comparable<connectedToLecture_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("connectedToLecture_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new connectedToLecture_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new connectedToLecture_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(connectedToLecture_result.class, metaDataMap); + } + + public connectedToLecture_result() { + } + + public connectedToLecture_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public connectedToLecture_result(connectedToLecture_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public connectedToLecture_result deepCopy() { + return new connectedToLecture_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public connectedToLecture_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof connectedToLecture_result) + return this.equals((connectedToLecture_result)that); + return false; + } + + public boolean equals(connectedToLecture_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(connectedToLecture_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("connectedToLecture_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class connectedToLecture_resultStandardSchemeFactory implements SchemeFactory { + public connectedToLecture_resultStandardScheme getScheme() { + return new connectedToLecture_resultStandardScheme(); + } + } + + private static class connectedToLecture_resultStandardScheme extends StandardScheme<connectedToLecture_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, connectedToLecture_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, connectedToLecture_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class connectedToLecture_resultTupleSchemeFactory implements SchemeFactory { + public connectedToLecture_resultTupleScheme getScheme() { + return new connectedToLecture_resultTupleScheme(); + } + } + + private static class connectedToLecture_resultTupleScheme extends TupleScheme<connectedToLecture_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + + public static class deleteLecture_args implements org.apache.thrift.TBase<deleteLecture_args, deleteLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteLecture_args> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteLecture_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteLecture_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteLecture_argsTupleSchemeFactory()); + } + + public String id; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_args.class, metaDataMap); + } + + public deleteLecture_args() { + } + + public deleteLecture_args( + String id) + { + this(); + this.id = id; + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteLecture_args(deleteLecture_args other) { + if (other.isSetId()) { + this.id = other.id; + } + } + + public deleteLecture_args deepCopy() { + return new deleteLecture_args(this); + } + + @Override + public void clear() { + this.id = null; + } + + public String getId() { + return this.id; + } + + public deleteLecture_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteLecture_args) + return this.equals((deleteLecture_args)that); + return false; + } + + public boolean equals(deleteLecture_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteLecture_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteLecture_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteLecture_argsStandardSchemeFactory implements SchemeFactory { + public deleteLecture_argsStandardScheme getScheme() { + return new deleteLecture_argsStandardScheme(); + } + } + + private static class deleteLecture_argsStandardScheme extends StandardScheme<deleteLecture_args> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteLecture_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteLecture_argsTupleSchemeFactory implements SchemeFactory { + public deleteLecture_argsTupleScheme getScheme() { + return new deleteLecture_argsTupleScheme(); + } + } + + private static class deleteLecture_argsTupleScheme extends TupleScheme<deleteLecture_args> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + } + } + + } + + public static class deleteLecture_result implements org.apache.thrift.TBase<deleteLecture_result, deleteLecture_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteLecture_result> { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteLecture_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteLecture_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteLecture_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_result.class, metaDataMap); + } + + public deleteLecture_result() { + } + + public deleteLecture_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on <i>other</i>. + */ + public deleteLecture_result(deleteLecture_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public deleteLecture_result deepCopy() { + return new deleteLecture_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public deleteLecture_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteLecture_result) + return this.equals((deleteLecture_result)that); + return false; + } + + public boolean equals(deleteLecture_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteLecture_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteLecture_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteLecture_resultStandardSchemeFactory implements SchemeFactory { + public deleteLecture_resultStandardScheme getScheme() { + return new deleteLecture_resultStandardScheme(); + } + } + + private static class deleteLecture_resultStandardScheme extends StandardScheme<deleteLecture_result> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteLecture_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteLecture_resultTupleSchemeFactory implements SchemeFactory { + public deleteLecture_resultTupleScheme getScheme() { + return new deleteLecture_resultTupleScheme(); + } + } + + private static class deleteLecture_resultTupleScheme extends TupleScheme<deleteLecture_result> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index d5d3aba1..14157a61 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -19,154 +19,174 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; import org.apache.thrift.TException; import sql.SQL; import util.XMLCreator; - public class ServerHandler implements Server.Iface { - static SQL sql=new SQL(); - static Connection con=sql.getConnection(); + static SQL sql = new SQL(); + static Connection con = sql.getConnection(); + private static Logger log = Logger.getLogger(ServerHandler.class); + /** * @param args */ - /*public static void main(String[] args) { - // TODO Auto-generated method stub - - }*/ + /* + * public static void main(String[] args) { // TODO Auto-generated method + * stub + * + * } + */ @Override public User getFtpUser() throws TException { - User user=new User(); + log.info(new Date() + " - returing FTPUser..."); + User user = new User(); user.setUserName(UUID.randomUUID().toString().substring(0, 8)); - user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString().substring(0, 8))); + user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() + .substring(0, 8))); user.setPath("/srv/openslx/nfs/temp"); - SQL sql=new SQL(); - Connection con=sql.getConnection(); + SQL sql = new SQL(); + Connection con = sql.getConnection(); sql.writeFTPUser(con, user.getUserName(), user.getPassword()); + log.info(new Date() + " - successfully returned FTPUser"); return user; } - public String getEncodedSha1Sum(String key) { - try { - MessageDigest md = MessageDigest.getInstance( "SHA1" ); - md.update( key.getBytes() ); - return new BigInteger(1, md.digest()).toString(16); - } - catch (NoSuchAlgorithmException e) { - // handle error case to taste - } + try { + log.info(new Date() + " - returned EncodedSha1Sum..."); + MessageDigest md = MessageDigest.getInstance("SHA1"); + md.update(key.getBytes()); + log.info(new Date() + " - successfully returned EncodedSha1Sum"); + return new BigInteger(1, md.digest()).toString(16); + } catch (NoSuchAlgorithmException e) { + // handle error case to taste + } return null; } @Override public long DeleteFtpUser(String user) throws TException { int ret = sql.DeleteUser(con, user); + log.info(new Date() + " - deleting FTPUser"); return ret; } @Override - public String getPathOfImage(String image_id, String version) throws TException { - + public String getPathOfImage(String image_id, String version) + throws TException { + try { - ResultSet rs=sql.getPathOfImage(con, image_id, version); + log.info(new Date() + " - returning PathOfImage..."); + ResultSet rs = sql.getPathOfImage(con, image_id, version); System.out.println("Path SQL erfolgreich"); rs.next(); System.out.println(rs.getString("image_path")); + log.info(new Date() + " - successfully returned PathOfImage: " + + rs.getString("image_path")); return rs.getString("image_path"); } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + log.info(new Date() + " - returning PathOfImage: null"); return null; } @Override public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, - String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) - throws TException { - String login="tete"; - - int pk_institution=sql.setInstitution(con, university); - - int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - - sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename, imagePath); + String Fak, boolean license, boolean internet, long ram, long cpu, + String imagePath) throws TException { + String login = "tete"; + + int pk_institution = sql.setInstitution(con, university); + + int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + new Date(), pk_institution); + sql.setImageData(con, pk_person, license, internet, cpu, ram, + imagename, imagePath); + + log.info(new Date() + " - writing VLdata"); // TODO Auto-generated method stub return true; } @Override public List<Image> getImageList() throws TException { - ResultSet res=sql.getImageList(con); - + ResultSet res = sql.getImageList(con); + List<Image> list = new ArrayList<Image>(); try { - - while(res.next()) - { - - list.add(new Image(res.getString("GUID_imageID"),res.getString("imageVersion"),res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user"))); - + + while (res.next()) { + + list.add(new Image(res.getString("GUID_imageID"), res + .getString("imageVersion"), + res.getString("image_name"), res + .getString("cond_hasLicenseRestriction"), res + .getString("name"), res.getString("lecture"), + res.getString("image_update_time"), res + .getString("user"))); + } - + log.info(new Date() + " - returning ImageList: " + list.size()); return list; } catch (SQLException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - + log.info(new Date() + " - returning ImageList: " + list.size()); return null; } - @Override public List<String> getAllOS() throws TException { - List<String> list=new ArrayList<>(); - ResultSet rs=sql.getAllOS(con); + List<String> list = new ArrayList<>(); + ResultSet rs = sql.getAllOS(con); try { - while(rs.next()) - { + while (rs.next()) { list.add(rs.getString("name")); } + log.info(new Date() + " - returning AllOS: " + list.size()); return list; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning AllOS: " + list.size()); return null; } @Override public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException { - Map<String,String> map=new HashMap<String, String>(); - - ResultSet rs=sql.getPersonData(con, Vorname, Nachname); + Map<String, String> map = new HashMap<String, String>(); + + ResultSet rs = sql.getPersonData(con, Vorname, Nachname); try { - while(rs.next()) - { - + while (rs.next()) { + map.put("mail", rs.getString("mail")); map.put("Nachname", rs.getString("Nachname")); map.put("Vorname", rs.getString("Vorname")); map.put("Hochschule", rs.getString("name")); - } + log.info(new Date() + " - returning PersonData: " + map.size()); return map; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning PersonData: " + map.size()); return null; } @@ -177,100 +197,117 @@ public class ServerHandler implements Server.Iface { String university, String Mail, String Tel, String Fak) throws TException { int pk_image = 0; - String login="tete"; + String login = "tete"; int imageversion = 0; - int pk_institution=sql.setInstitution(con, university); - int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - - ResultSet image=sql.getImageIDandVersion(con, imagename); - - try { - while(image.next()) - { - pk_image=image.getInt("GUID_imageID"); - imageversion=image.getInt("imageVersion"); - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - System.out.println(startDate); - sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive); - XMLCreator xml=new XMLCreator(con, name); - try { - xml.create(name); - System.out.println(new Date() + " - Creator beendet"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TransformerException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + int pk_institution = sql.setInstitution(con, university); + int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + new Date(), pk_institution); + + ResultSet image = sql.getImageIDandVersion(con, imagename); + + try { + while (image.next()) { + pk_image = image.getInt("GUID_imageID"); + imageversion = image.getInt("imageVersion"); } + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + System.out.println(startDate); + sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, + shortdesc, startDate, endDate, isActive); + XMLCreator xml = new XMLCreator(con, name); + try { + xml.create(name); + log.info(new Date() + " - XML created"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ParserConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TransformerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return false; } @Override public boolean startFileCopy(String file) throws TException { - File tmpFile=new File(file); + File tmpFile = new File(file); - System.out.println("Vor Move" +new Date()); + System.out.println("Vor Move" + new Date()); try { + + //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? + FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); + //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); + + // der übergebene Filename ist falsch - hier muss der generierte + // name geholt werden, nicht der ursprüngliche name. wo wird dieser + // eingelesen? + FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" + + tmpFile.getName())); + log.info(new Date() + " - file moved"); + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } - - System.out.println("Nach Move"+new Date()); return true; } - @Override - public Map<String, String> getImageData(String imageid, String imageversion) throws TException { - - ResultSet data=sql.getImageData(con, imageid, imageversion); - - Map<String,String> map=new HashMap<String, String>(); + public Map<String, String> getImageData(String imageid, String imageversion) + throws TException { + + ResultSet data = sql.getImageData(con, imageid, imageversion); + + Map<String, String> map = new HashMap<String, String>(); try { - while(data.next()) - { - System.out.println(data.getString("cond_hasInternetRestriction")+data.getString("cond_hasLicenseRestriction")+data.getString("cond_minCPUs")+data.getString("cond_minRAM")); - map.put("name",data.getString("image_name")); - map.put("internet", data.getString("cond_hasInternetRestriction")); + while (data.next()) { + System.out.println(data + .getString("cond_hasInternetRestriction") + + data.getString("cond_hasLicenseRestriction") + + data.getString("cond_minCPUs") + + data.getString("cond_minRAM")); + map.put("name", data.getString("image_name")); + map.put("internet", + data.getString("cond_hasInternetRestriction")); map.put("license", data.getString("cond_hasLicenseRestriction")); map.put("cpu", data.getString("cond_minCPUs")); map.put("ram", data.getString("cond_minRAM")); - + } System.out.println("return success"); + log.info(new Date() + " - returning ImageData: "+map.size()); return map; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning ImageData: "+map.size()); return null; } - @Override - public boolean updateImageData(String name, String newName,boolean license, - boolean internet, long ram, long cpu,String id, String version) throws TException { + public boolean updateImageData(String name, String newName, + boolean license, boolean internet, long ram, long cpu, String id, + String version) throws TException { System.out.println("Server: Vor Update"); - sql.UpdateImageData(con, name, newName ,license, internet, cpu, ram, id, version); + sql.UpdateImageData(con, name, newName, license, internet, cpu, ram, + id, version); System.out.println("Update erfolgreich"); + log.info(new Date() + " - updated ImageData"); return false; } - @Override public Map<String, String> getLectureData(String lecturename) throws TException { @@ -278,53 +315,53 @@ public class ServerHandler implements Server.Iface { return null; } - @Override public List<Lecture> getLectureList() throws TException { - ResultSet res=sql.getLectureList(con); - + ResultSet res = sql.getLectureList(con); + List<Lecture> list = new ArrayList<Lecture>(); try { - - while(res.next()) - { - - list.add(new Lecture(res.getString("lectureID"), res.getString("name"), res.getString("isActive"), res.getString("startTime"), res.getString("endTime"), res.getString("lastUsed"), res.getString("description"), res.getString("image_name"), res.getString("user"))); - - } - + while (res.next()) { + + list.add(new Lecture(res.getString("lectureID"), res + .getString("name"), res.getString("isActive"), res + .getString("startTime"), res.getString("endTime"), res + .getString("lastUsed"), res.getString("description"), + res.getString("image_name"), res.getString("user"))); + + } + log.info(new Date() + " - returning LectureList: "+list.size()); return list; } catch (SQLException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - + log.info(new Date() + " - returning LectureList: "+list.size()); return null; } - @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws TException { - int pk_image=0; - int imageversion=0; - ResultSet image=sql.getImageIDandVersion(con, imagename); + int pk_image = 0; + int imageversion = 0; + ResultSet image = sql.getImageIDandVersion(con, imagename); try { - while(image.next()) - { - pk_image=image.getInt("GUID_imageID"); - imageversion=image.getInt("imageVersion"); + while (image.next()) { + pk_image = image.getInt("GUID_imageID"); + imageversion = image.getInt("imageVersion"); } } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } +<<<<<<< HEAD sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id); XMLCreator xml=new XMLCreator(con, newName); @@ -336,7 +373,57 @@ public class ServerHandler implements Server.Iface { e.printStackTrace(); } +======= + sql.updateLectureData(con, pk_image, imageversion, lastname, newName, + desc, shortdesc, startDate, endDate, isActive, id); + log.info(new Date() + " - updated LectureData"); +>>>>>>> a3c0327dbd49efc29ede542f7093638941a7ae13 return false; } + + @Override + public boolean deleteImageServer(String imageid, String imageversion) throws TException{ + /* + * + * + * + * File noch iniziieren + */ + // Pfad der Datei aus der DB auslesen und hier eintragen + //File tmpFile=new File("127.0.0.1:/srv/openslx/nfs/temp/"); + File tmpFile = null; + + try { + //File wird von Server gelöscht + FileUtils.forceDelete(tmpFile); + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + + } + + return true; + } + + @Override + public boolean deleteImageData(String id, String version) throws TException { + + return sql.deleteImage(con, id, version); + } + + @Override + public boolean connectedToLecture(String id, String version) + throws TException { + // TODO Auto-generated method stub + return sql.connectedToLecture(con, id, version); + } + + public boolean deleteLecture(String id){ + return sql.deleteLecture(con, id); + } + + + } diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index e1ab22c0..542c92b8 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -28,6 +28,8 @@ public class startServer { t = new Thread(new BinaryListener()); servers.add(t); t.start(); + //information + log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); // Run more servers // ... // Wait for all servers to die diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 27bdc17c..5c5b0ec6 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -1,24 +1,18 @@ package sql;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
+
import java.text.DateFormat;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
-
import org.apache.log4j.Logger;
-
import server.BinaryListener;
public class SQL {
- private static Logger log = Logger.getLogger( BinaryListener.class );
-
+ private static Logger log = Logger.getLogger(BinaryListener.class);
+
public Connection getConnection() {
try {
Class.forName("com.mysql.jdbc.Driver").newInstance();
@@ -53,7 +47,8 @@ public class SQL { + pass
+ "'),'10001','12345','/srv/openslx/nfs/temp');");
con.commit();
- log.info(new Date() + " - created FTPUser "+user+" : "+pass+".");
+ log.info(new Date() + " - created FTPUser " + user + " : " + pass
+ + ".");
return ret;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -72,11 +67,11 @@ public class SQL { .executeUpdate("DELETE FROM `bwLehrpool`.`FtpUsers` where User like '"
+ user + "';");
con.commit();
- log.info(new Date() + " - FTPUser "+user+" deleted.");
+ log.info(new Date() + " - FTPUser " + user + " deleted.");
return ret;
} catch (SQLException e) {
// TODO Auto-generated catch block
- log.info(new Date() + " - Could not delete FTPUser "+user+".");
+ log.info(new Date() + " - Could not delete FTPUser " + user + ".");
e.printStackTrace();
}
return -1;
@@ -214,44 +209,31 @@ public class SQL { Random random = new Random();
int uid = random.nextInt();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('"
- + uid //GUID_imageID
- + "',1,'" //imageVersion
- + imagename //image_name
- + "','"
- + imagePath //image_path
- + "','"
- + formatter.format(new Date()) //image_lastCall
- + "','"
- + formatter.format(new Date()) //image_create_time
- + "','"
- + formatter.format(new Date()) //image_update_time
- + "','"
- + pk_person //image_owner
- + "','"
- + pk_person //image_change_by
- + "','"
- + formatter.format(new Date()) //rec_create_time
- + "','"
- + formatter.format(new Date()) //rec_change_time
- + "','"
- + pk_person //rec_owner
- + "','"
- + pk_person //rec_change_by
- + "',0" //content_operatingSystem
- + ",1" //status_isCompressed
- + ",1" //status_isSecure
- + ",1" //status_isOptimzed
- + ",1" //status_isValid
- + ",1" //status_isReady
- + ",0" //status_isDeleted
- + ",0,'" //status_isLastOfficialVersion
- + license_bol //cond_hasLicenseRestriction
- + "','"
- + internet_bol //cond_hasInternetRestriction
- + "','"
- + ram //cond_minRAM
- + "','"
- + cpu //cond_minCPUs
+ + uid // GUID_imageID
+ + "',1,'" // imageVersion
+ + imagename // image_name
+ + "','" + imagePath // image_path
+ + "','" + formatter.format(new Date()) // image_lastCall
+ + "','" + formatter.format(new Date()) // image_create_time
+ + "','" + formatter.format(new Date()) // image_update_time
+ + "','" + pk_person // image_owner
+ + "','" + pk_person // image_change_by
+ + "','" + formatter.format(new Date()) // rec_create_time
+ + "','" + formatter.format(new Date()) // rec_change_time
+ + "','" + pk_person // rec_owner
+ + "','" + pk_person // rec_change_by
+ + "',0" // content_operatingSystem
+ + ",1" // status_isCompressed
+ + ",1" // status_isSecure
+ + ",1" // status_isOptimzed
+ + ",1" // status_isValid
+ + ",1" // status_isReady
+ + ",0" // status_isDeleted
+ + ",0,'" // status_isLastOfficialVersion
+ + license_bol // cond_hasLicenseRestriction
+ + "','" + internet_bol // cond_hasInternetRestriction
+ + "','" + ram // cond_minRAM
+ + "','" + cpu // cond_minCPUs
+ "');");
con.commit();
@@ -447,10 +429,39 @@ public class SQL { }
return -1;
}
-
+
+ /**
+ *
+ * @param id
+ * @param version
+ * @return
+ */
+
+ public boolean deleteImage(Connection con, String id, String version) {
+
+ try {
+
+ Statement stm = con.createStatement();
+
+ stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ + id + "' " + "AND imageVersion = '" + version + "';");
+
+ con.commit();
+
+ return true;
+
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+
public int updateLectureData(Connection con, int pk_image,
- int imageversion, String name, String newName ,String desc, String shortdesc,
- String start, String end, boolean isactive, String id) {
+ int imageversion, String name, String newName, String desc,
+ String shortdesc, String start, String end, boolean isactive,
+ String id) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
int active_bol = 0;
@@ -461,30 +472,68 @@ public class SQL { try {
Statement stm = con.createStatement();
stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '"
- +newName
- +"',`isActive` = '"
- +active_bol
- +"',`startTime` = '"
- +start
- +"',`endTime` = '"
- +end
- +"',`description` = '"
- +desc
- +"',`imageID` = '"
- +pk_image
- +"',`imageVersion` = '"
- +imageversion
- +"',`admin_changeTime` = '"
- +formatter.format(new Date())
- +"'WHERE `lectureID` = '"
- +id+"';" );
+ + newName
+ + "',`isActive` = '"
+ + active_bol
+ + "',`startTime` = '"
+ + start
+ + "',`endTime` = '"
+ + end
+ + "',`description` = '"
+ + desc
+ + "',`imageID` = '"
+ + pk_image
+ + "',`imageVersion` = '"
+ + imageversion
+ + "',`admin_changeTime` = '"
+ + formatter.format(new Date())
+ + "'WHERE `lectureID` = '" + id + "';");
con.commit();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+
return 0;
}
+
+ public boolean connectedToLecture(Connection con, String id, String version) {
+
+ try {
+
+ Statement stm = con.createStatement();
+
+ ResultSet rs = stm.executeQuery("SELECT lectureID FROM "
+ + "bwLehrpool.m_VLData_lecture WHERE imageID = '" + id
+ + "' AND imageVersion = '" + version + "';");
+
+ return rs.first();
+
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return false;
+
+ }
+
+ public boolean deleteLecture(Connection con, String id) {
+
+ try {
+ Statement stm = con.createStatement();
+ stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"+ id + "';");
+
+ con.commit();
+
+ return true;
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return false;
+ }
}
diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 2bcc9ba1..6bb328fe 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -46,5 +46,9 @@ service Server{ map<string,string> getImageData(string imageid, string imageversion), bool updateImageData(string name, string newName,bool license, bool internet, int ram,int cpu, string id, string version), map<string,string> getLectureData(string lecturename), + bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), + bool deleteImageServer(string id, string version), + bool connectedToLecture(string id, string version), + bool deleteLecture(string id), }
\ No newline at end of file |