From 5c80c56cbcdd3dc677f743b0bf8a8de6a504218b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Mar 2014 13:23:25 +0100 Subject: SQL Abfragen auf ID und Version umgestellt --- Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 8976 -> 8826 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class') diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index b848f2b1..7dd90d89 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ -- cgit v1.2.3-55-g7522 From ddd6cc7400e00586d52840deb0ec8df98f69de4a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Mar 2014 12:49:02 +0100 Subject: -XML Creator eingebaut -Dateiname angepasst -> Uploader funktioniert nun wieder --- Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 8826 -> 8826 bytes .../bin/GUI/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7645 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 1382 -> 1382 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 1775 -> 1775 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI.class | Bin 7415 -> 7415 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI.class | Bin 9135 -> 9098 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 10530 -> 11083 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$7.class | Bin 2402 -> 2402 bytes Dozentenmodul/bin/GUI/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/GUI/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/GUI/Login_GUI$3.class | Bin 2392 -> 4427 bytes Dozentenmodul/bin/GUI/Login_GUI.class | Bin 3731 -> 3947 bytes Dozentenmodul/bin/Models/person.class | Bin 1882 -> 2032 bytes Dozentenmodul/bin/auth/Authentification.class | Bin 283 -> 449 bytes Dozentenmodul/bin/ftp/FTPUtility.class | Bin 5153 -> 5211 bytes Dozentenmodul/bin/ftp/UploadTask.class | Bin 3378 -> 3378 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 8826 -> 8826 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI.class | Bin 7075 -> 7075 bytes .../bin/gui/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7645 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 1382 -> 1382 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 1775 -> 1775 bytes .../gui/EingabeVeranstaltungAllgemein_GUI.class | Bin 7415 -> 7415 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI.class | Bin 9135 -> 9098 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 1574 -> 1574 bytes Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 10530 -> 11083 bytes Dozentenmodul/bin/gui/LinkImage_GUI$7.class | Bin 2402 -> 2402 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 4049 -> 4427 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 3947 -> 3947 bytes Dozentenmodul/bin/models/person.class | Bin 1882 -> 2032 bytes Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java | 8 +- .../src/GUI/EingabeImageAllgemein_GUI.java | 8 +- .../src/GUI/EingabeVeranstaltungAllgemein_GUI.java | 24 +-- Dozentenmodul/src/GUI/FTPDownloader_GUI.java | 2 +- Dozentenmodul/src/GUI/FTPUploader_GUI.java | 13 +- Dozentenmodul/src/GUI/LinkImage_GUI.java | 2 +- Dozentenmodul/src/GUI/Login_GUI.java | 45 ++++- Dozentenmodul/src/Models/person.java | 11 +- Dozentenmodul/src/auth/Authentification.java | 7 + Dozentenmodul/src/ftp/FTPUtility.java | 10 +- Dozentenmodul/src/ftp/UploadTask.java | 3 +- Dozentenmodul/src/gui/EditImageAllgemein_GUI.java | 8 +- .../src/gui/EditVeranstaltungAllgemein_GUI.java | 8 +- .../src/gui/EingabeImageAllgemein_GUI.java | 8 +- .../src/gui/EingabeVeranstaltungAllgemein_GUI.java | 24 +-- Dozentenmodul/src/gui/FTPDownloader_GUI.java | 2 +- Dozentenmodul/src/gui/FTPUploader_GUI.java | 13 +- Dozentenmodul/src/gui/LinkImage_GUI.java | 2 +- Dozentenmodul/src/gui/Login_GUI.java | 18 +- Dozentenmodul/src/models/person.java | 11 +- .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 2993 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 2945 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 3332 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 3246 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3157 -> 3157 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 3863 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4410 -> 4410 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4135 -> 4241 bytes .../bin/server/Server$AsyncClient.class | Bin 7862 -> 7922 bytes .../bin/server/Server$AsyncIface.class | Bin 1407 -> 1425 bytes .../Server$AsyncProcessor$DeleteFtpUser$1.class | Bin 2969 -> 2969 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS$1.class | Bin 2997 -> 2997 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../Server$AsyncProcessor$getFtpUser$1.class | Bin 2851 -> 2851 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData$1.class | Bin 3081 -> 3081 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList$1.class | Bin 3021 -> 3021 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData$1.class | Bin 3099 -> 3099 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getPathOfImage$1.class | Bin 2907 -> 2907 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3128 -> 3128 bytes .../Server$AsyncProcessor$getPersonData$1.class | Bin 3090 -> 3090 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy$1.class | Bin 2984 -> 2984 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData$1.class | Bin 3002 -> 3002 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata$1.class | Bin 3011 -> 3011 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../Server$AsyncProcessor$writeVLdata$1.class | Bin 2966 -> 2966 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3446 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3280 -> 3280 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 13975 -> 14082 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 1577 -> 1595 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 2036 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2014 -> 2014 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 2279 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2563 -> 2563 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2346 -> 2390 bytes .../bin/server/Server$Processor.class | Bin 3113 -> 3113 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3462 -> 3462 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 10610 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3007 -> 3007 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2640 -> 2640 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2124 -> 2124 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 9481 -> 9481 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 3587 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 3944 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3289 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 18468 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4053 -> 4053 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 4862 -> 4862 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4056 -> 4056 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 24604 -> 24604 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3821 -> 3914 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4451 -> 4637 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 3724 -> 3886 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 22061 -> 23310 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 8905 -> 9540 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 11577 -> 11593 bytes Dozentenmodulserver/bin/util/XMLCreator.class | Bin 0 -> 6252 bytes Dozentenmodulserver/src/server/Server.java | 132 +++++++++++-- Dozentenmodulserver/src/server/ServerHandler.java | 25 ++- Dozentenmodulserver/src/sql/SQL.java | 4 +- Dozentenmodulserver/src/util/XMLCreator.java | 213 +++++++++++++++++++++ Dozentenmodulserver/thrift/server.thrift | 2 +- 268 files changed, 510 insertions(+), 93 deletions(-) create mode 100644 Dozentenmodulserver/bin/util/XMLCreator.class create mode 100644 Dozentenmodulserver/src/util/XMLCreator.java (limited to 'Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class') diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index 7dd90d89..fe7cbc2f 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class index 3aa6d518..ba01d472 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class index 968c8af7..9a60b2bb 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class index 6750763b..7ef0c949 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class index 57ddab82..1e1426e0 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class index 9dd8d00c..1098273e 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class index 3a3714a5..ea94db00 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class index 905d3fde..9e658891 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class index 4b544121..e8031c6b 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class index c4594204..8a248b02 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class index 556db5fc..71928437 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class index 64da3d54..52709eee 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class index 1275514d..c2ded647 100644 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class index 3ba048a4..a0cfa528 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$1.class and b/Dozentenmodul/bin/GUI/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class index 4c73519c..ff56145f 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$2.class and b/Dozentenmodul/bin/GUI/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class index 9d555d1d..aad19364 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$3.class and b/Dozentenmodul/bin/GUI/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI.class b/Dozentenmodul/bin/GUI/Login_GUI.class index 621e1e3f..c784876c 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI.class and b/Dozentenmodul/bin/GUI/Login_GUI.class differ diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class index 8c7815e5..49a2be85 100644 Binary files a/Dozentenmodul/bin/Models/person.class and b/Dozentenmodul/bin/Models/person.class differ diff --git a/Dozentenmodul/bin/auth/Authentification.class b/Dozentenmodul/bin/auth/Authentification.class index e7a2611d..0d9b3144 100644 Binary files a/Dozentenmodul/bin/auth/Authentification.class and b/Dozentenmodul/bin/auth/Authentification.class differ diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class index f563788c..e0536990 100644 Binary files a/Dozentenmodul/bin/ftp/FTPUtility.class and b/Dozentenmodul/bin/ftp/FTPUtility.class differ diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class index 12ba0962..32bd6720 100644 Binary files a/Dozentenmodul/bin/ftp/UploadTask.class and b/Dozentenmodul/bin/ftp/UploadTask.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class index 7dd90d89..fe7cbc2f 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class index 95bbb104..dba15ce3 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class index 3aa6d518..ba01d472 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class index 968c8af7..9a60b2bb 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class index 6750763b..7ef0c949 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class index 57ddab82..1e1426e0 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class index 9dd8d00c..1098273e 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class index 3a3714a5..ea94db00 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class index 905d3fde..9e658891 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class index 4b544121..e8031c6b 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class index c4594204..8a248b02 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class index 556db5fc..71928437 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class index d6b733e8..290754eb 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class index 64da3d54..52709eee 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class index 1275514d..c2ded647 100644 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index 415f2233..a0cfa528 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index 6a03ae8e..ff56145f 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index d617ce42..aad19364 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index bc297a50..c784876c 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class index 8c7815e5..49a2be85 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java index 9eef919a..140d017b 100644 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditImageAllgemein_GUI extends JFrame { Vorname.setEditable(false); Vorname.setEnabled(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -137,7 +137,7 @@ public class EditImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -151,7 +151,7 @@ public class EditImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -165,7 +165,7 @@ public class EditImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java index 12678e0e..8fa942b7 100644 --- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java @@ -119,7 +119,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Vorname.setEnabled(false); Vorname.setEditable(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -133,7 +133,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -147,7 +147,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -161,7 +161,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java index 2e2c60c3..6bc55553 100644 --- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); @@ -222,11 +222,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); @@ -245,11 +245,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_GUI(); diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java index 702b7f67..e702dc4a 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java @@ -299,7 +299,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - task = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this); + task = new DownloadTask(host, port, user.userName, user.password,user.path, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun=true; diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java index 078f8075..8c26999d 100644 --- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java @@ -15,6 +15,9 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -38,6 +41,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import util.XMLCreator; import ftp.UploadTask; @@ -348,9 +352,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter=new SimpleDateFormat("yyyMMddhhmmss"); + + System.out.println(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); + Image.image.setNewName(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); - + task.addPropertyChangeListener(this); task.execute(); taskrun=true; @@ -405,7 +412,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu()); + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), "/srv/openslx/nfs/temp/"+Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/GUI/LinkImage_GUI.java index 38b3d5e3..b8b1920e 100644 --- a/Dozentenmodul/src/GUI/LinkImage_GUI.java +++ b/Dozentenmodul/src/GUI/LinkImage_GUI.java @@ -359,7 +359,7 @@ public class LinkImage_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); - client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java index cc558261..c3987526 100644 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ b/Dozentenmodul/src/GUI/Login_GUI.java @@ -27,7 +27,17 @@ import javax.swing.border.EmptyBorder; import models.person; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; import org.ini4j.Wini; +import thrift.AuthenticationException; +import thrift.ImageServer; +import thrift.InvalidTokenException; +import thrift.SessionData; +import thrift.MasterThriftConnection; +import thrift.ImageServer.Client; +import thrift.UserInfo; import config.config_file; @@ -145,6 +155,26 @@ public class Login_GUI extends JFrame { //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; + try { + String passText = new String(pass.getPassword()); + System.out.println(username.getText()+" "+passText); + result = client.authenticate(username.getText(), passText); + + } catch (thrift.AuthenticationException e) { + System.out.println("Authentifizierung fehlgeschlagen: " + + e.message); + return; + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + 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) { @@ -168,17 +198,22 @@ public class Login_GUI extends JFrame { } else { - person.verantowrtlicher.setName("Spitzer"); - person.verantowrtlicher.setVorname("Tobias"); - person.verantowrtlicher.setEMail("tspitzer@hs-offenburg.de"); - person.verantowrtlicher.setHochschule("HS Offenburg"); + UserInfo user=client.getUserFromToken(token); + + String hochschule=user.eMail.substring(user.eMail.indexOf("@")+1,user.eMail.indexOf(".")); + //System.out.println(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 e) { + } catch (IOException | TException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index f4dd5c22..24ab16f3 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -3,6 +3,7 @@ package models; public class person{ + private String username; private String Name; private String Vorname; private String Hochschule; @@ -12,9 +13,15 @@ public class person{ private boolean ischecked; - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); + public static person verantwortlicher=new person(); + + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } public String getName() { return Name; } diff --git a/Dozentenmodul/src/auth/Authentification.java b/Dozentenmodul/src/auth/Authentification.java index cf1a4b04..41f69502 100644 --- a/Dozentenmodul/src/auth/Authentification.java +++ b/Dozentenmodul/src/auth/Authentification.java @@ -1,5 +1,12 @@ package auth; +import thrift.UserInfo; + public class Authentification { + public boolean auth(String username, String pass) + { + return false; + + } } diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index c62ba07d..7824440a 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -6,6 +6,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.SocketException; import java.security.NoSuchAlgorithmException; + +import models.Image; + import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; @@ -138,9 +141,10 @@ public class FTPUtility { if (!success) { throw new FTPException("Could not set binary file type."); } - - outputStream = ftpClient.storeFileStream(uploadFile.getName()); - // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname()); + + outputStream = ftpClient.storeFileStream(Image.image.getNewName()); + + //ftpClient.rename(uploadFile.getName(), ); } catch (IOException ex) { throw new FTPException("Error uploading file: " + ex.getMessage()); } diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index e5d8a817..67706169 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -19,7 +19,7 @@ public class UploadTask extends SwingWorker { private int port; private String username; private String password; - + private String destDir; private File uploadFile; @@ -31,6 +31,7 @@ public class UploadTask extends SwingWorker { this.password = password; this.destDir = destDir; this.uploadFile = uploadFile; + } /** diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java index 9eef919a..140d017b 100644 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditImageAllgemein_GUI extends JFrame { Vorname.setEditable(false); Vorname.setEnabled(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -137,7 +137,7 @@ public class EditImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -151,7 +151,7 @@ public class EditImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -165,7 +165,7 @@ public class EditImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java index ce2130c5..8bd57eac 100644 --- a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); diff --git a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java index 12678e0e..8fa942b7 100644 --- a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java @@ -119,7 +119,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Vorname.setEnabled(false); Vorname.setEditable(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -133,7 +133,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -147,7 +147,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -161,7 +161,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java index 2e2c60c3..6bc55553 100644 --- a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); @@ -222,11 +222,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); @@ -245,11 +245,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_GUI(); diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java index 702b7f67..e702dc4a 100644 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java @@ -299,7 +299,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - task = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this); + task = new DownloadTask(host, port, user.userName, user.password,user.path, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun=true; diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java index 0bf92b82..fd11697c 100644 --- a/Dozentenmodul/src/gui/FTPUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPUploader_GUI.java @@ -15,6 +15,9 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -38,6 +41,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import util.XMLCreator; import ftp.UploadTask; @@ -348,9 +352,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter=new SimpleDateFormat("yyyMMddhhmmss"); + + System.out.println(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); + Image.image.setNewName(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); - + task.addPropertyChangeListener(this); task.execute(); taskrun=true; @@ -405,7 +412,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu()); + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), "/srv/openslx/nfs/temp/"+Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/LinkImage_GUI.java b/Dozentenmodul/src/gui/LinkImage_GUI.java index 38b3d5e3..b8b1920e 100644 --- a/Dozentenmodul/src/gui/LinkImage_GUI.java +++ b/Dozentenmodul/src/gui/LinkImage_GUI.java @@ -359,7 +359,7 @@ public class LinkImage_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); - client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index 58d1d104..c3987526 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -33,9 +33,11 @@ import org.apache.thrift.protocol.TProtocol; import org.ini4j.Wini; import thrift.AuthenticationException; import thrift.ImageServer; +import thrift.InvalidTokenException; import thrift.SessionData; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.UserInfo; import config.config_file; @@ -161,6 +163,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText()+" "+passText); result = client.authenticate(username.getText(), passText); + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); @@ -195,17 +198,22 @@ public class Login_GUI extends JFrame { } else { - person.verantowrtlicher.setName("Spitzer"); - person.verantowrtlicher.setVorname("Tobias"); - person.verantowrtlicher.setEMail("tspitzer@hs-offenburg.de"); - person.verantowrtlicher.setHochschule("HS Offenburg"); + UserInfo user=client.getUserFromToken(token); + + String hochschule=user.eMail.substring(user.eMail.indexOf("@")+1,user.eMail.indexOf(".")); + //System.out.println(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 e) { + } catch (IOException | TException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index f4dd5c22..24ab16f3 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -3,6 +3,7 @@ package models; public class person{ + private String username; private String Name; private String Vorname; private String Hochschule; @@ -12,9 +13,15 @@ public class person{ private boolean ischecked; - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); + public static person verantwortlicher=new person(); + + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } public String getName() { return Name; } diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 865c5b26..54ae8fb1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index 80af0891..dcf9e658 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 02191978..636d50e6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 41e05b62..52b62ee2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 64c048eb..47bcd119 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index 7eb94853..b9cb1ea4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index fe7c807b..2e0afed7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index c374d0d4..cd52da88 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 7cac2bf0..2c9e4c7e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 550eff24..590c2bcd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index 9598d144..7f8ae8c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index d66713c3..ad0574c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 293650a5..13538c1f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 09e66793..635c53c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index a562e259..3f738078 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class index c67fc9b7..6290a004 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 8390ce15..ba289f63 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class index 115f41de..3fbb8677 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index cae2f5fe..edb1bcec 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class index 131adf41..40306c0d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index afda8e77..c732068a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class index eb3d7333..45589df3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index 2f2a3426..b6a19652 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class index 2c999000..7088768e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index 35ca3d88..aa7ecc5b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class index 4f5763ec..dd89977c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index dc9ab4c5..705a33c7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class index 84d6c9e5..89af670d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 3d8425c0..2471001a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class index 884944a8..693325cd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index c98b333e..ae81f238 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class index 3705e516..61e06f52 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index 2ca1a1df..b2db8d99 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class index 47b8e46f..c2c2ca58 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index bb0c6ef5..2d438884 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class index 8421168b..f2b57fb7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index d6ae2a96..60246d3e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class index b466b220..c495d813 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index c37b1f7d..08f594ca 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index f847f005..31a856b1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index c127f59d..2fed4f2f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index eb173739..0fb66c0d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index 7619d485..ce5024d6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index c638782e..cda02dce 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index a09806dd..a53a5690 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 52c9150d..4c817ea4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index cf27e205..0485efb4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index e1257cfa..06122d58 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index 4fc3825c..a39d1d63 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index 802da8e5..69232dd9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 791c1333..6b95e144 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index 0af91fe9..b48d1db8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index 40f4e483..ba4b4c81 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index 0d1c85df..974ce04a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index e36dd7e0..af38e742 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index a9280272..a190c32b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index ab3c6465..890e8213 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index f01b8def..8d491ab8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index c1f3775d..f48d16cd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 58eec36e..40177d04 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index c4d4f5ee..d10aedf6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 513cb0d2..8c9f3d14 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index d8ea9ee2..c3cfe04b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 3925c6b9..5af2dce3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 7564db76..94eec707 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index dee99a40..4b3ca880 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 5f9b476a..8cb3e809 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 9018a557..16a4aceb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index 38fa5f83..abae47eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 83f3cf8e..4b06ae93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index ad0bc085..d01fdf1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index 0ff8444c..bb5e97c4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index 45ee60d5..42042b94 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index e6ad4712..f4fabf54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index 382a537e..348ca927 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index dcf01354..22764a7a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 89f8b72c..6a582eda 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index 8dd34ef5..be92db51 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index aa5e6316..e3af306c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 0ec7dac0..77822f8b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index b69dc408..d290e233 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 91328e9e..087be9cb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 02940dcb..165ca1fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index 5f86bdc8..01f278f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index f1d1cfa2..078a92a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 1c6fb9a4..1e27cb2b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index d5a7e86d..cf9f1a46 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index efe1819b..910a07be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index c3676bbf..e0c90c41 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index dc4904de..ea0aac68 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 039ebffe..1dc1acbe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index 131d29d7..b2b736b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index 97d14f92..46040508 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index 45c69805..0261ca03 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index d1bc7f40..61f1504d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index 000e0b79..3968c27f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index 5dc4b215..87f255d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 9713ba03..6b0de404 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index e22a6d6c..0fddf45d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index ba6dc963..c33d93c8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 32b926fd..5a78bea3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 6216224d..0a37b52c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index ca75471d..b32073e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index 9e347289..c9602e72 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index 505b08fd..b094d83f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index bf7f4388..4e0eac29 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index e59b3eb1..37d2bfce 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index 2e5cd51e..d3a5e629 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 6ae8f580..677cf6e7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index 3037bfde..a0e50f65 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index 209cdbf6..de271782 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index e9f28cc0..2cff3f79 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index c3e7f646..caf4f5ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index c0ccadcb..4bc03b1b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index 7058999a..d421488d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index ec30a751..4eec1f61 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 9f8839a6..25714de2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 56972419..9878f82f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index f229733a..820047ed 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index ef8092ad..e2615b10 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index 378685c3..a99172e0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index d9acc643..a09507c2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index dd0ea27f..a9efd658 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index 768af62d..c5d3070a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index 2884c0ef..f84046fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index fad9e6cf..a0e39f19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index 3aa5101d..18f2f747 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 1743d6e3..23a1b04e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 94f89f93..2bf508fe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index af58ad80..72c0e132 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index 589d1eac..465e526f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 83275be9..99a1ca2c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 0ccdf005..3d83b674 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index 27e2cdde..cf401688 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 30a37f90..20c33f69 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index eff507b9..d39b5eaa 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index e1fb8aaa..cd64d091 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index 8fc9d0fd..a6a046a9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index ce9b9d5a..5ca4e662 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index d40d6f6f..22767aa5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 0785eb3c..8c3ee771 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index 6ee3bb0b..ec794b93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 2a084bcb..7f78ba17 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index 68eb9e16..80170c5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index b403d181..e36694de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index 0e9a44c2..bafaca4a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index d965843c..0e90f432 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index 96c47f13..fe9789e5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 0919dd40..472541ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index a9803ea5..5784027a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index fc815287..1a12ac16 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index a55a6649..3b6a1df1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index ab0ce7f1..11278b31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index 02b6271c..2a2b9950 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index 95396680..bbc8f5de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 5dc59685..0e463eef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index f437ee19..f6ac5397 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index 49232524..f8694799 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index 4c213e41..928375bd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index 32148d45..883e1b4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index a6c38c8e..435037e1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index 0ba35504..63574fda 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index 03302886..1503f186 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index 1dfd96b6..a1aecc8d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 48a50aca..8f15a17a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index eb220f7a..09aeb14d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index 2bfc9d6f..d6f97faf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 493ff2da..12c2a78a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index 146b829f..2b2ce43d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index 896331bf..631bfe6d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index 6b9c63b2..4fb7b29b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 7f8968fa..57bf3c1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 4ac7c7ad..21152e10 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index c28a7bda..7b995a7c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index 17c73d88..bb71f7a1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index b4febffd..4af3c48a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index 30a469ee..df06ff1d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index c6948e98..de652ba4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index 2032f256..f17f52a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index 0588cdc3..da9eda5a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index 8f908837..adb3ed9f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index cd0eb89b..ee51aabf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 2db33d20..36303474 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index ec89e575..718cff17 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index 35cf7466..adf5624f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index f12ae330..6e02ab65 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index 9fd7ae26..2190e109 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 8716ff0d..9dcbd40e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index da3218b4..eddcd8b6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index fab99021..b0441555 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index fdc67267..9360cad9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index ff06fe27..89beaed4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index f687206d..5e5afdca 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 4cc909be..94197262 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index 0c4be6ed..b3416972 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index 8f128702..ee35f096 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 34cf6756..0106166e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 1ed01a7e..8a73f7e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index ca0bfbb9..ed2fb7df 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index ac6489f4..3e78390a 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 1b1ee550..c2a0c5c9 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class new file mode 100644 index 00000000..579a4cd4 Binary files /dev/null and b/Dozentenmodulserver/bin/util/XMLCreator.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 18362ab7..9994fcb4 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String name) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; public List getImageList() throws org.apache.thrift.TException; @@ -70,7 +70,7 @@ public class Server { public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -178,13 +178,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - 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) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException { - send_writeVLdata(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu); + send_writeVLdata(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); @@ -198,6 +198,7 @@ public class Server { args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); + args.setImagePath(imagePath); sendBase("writeVLdata", args); } @@ -525,9 +526,9 @@ public class Server { } } - public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -544,7 +545,8 @@ public class Server { private boolean internet; private long ram; private long cpu; - public writeVLdata_call(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String imagePath; + public writeVLdata_call(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler, 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.imagename = imagename; this.firstname = firstname; @@ -557,6 +559,7 @@ public class Server { this.internet = internet; this.ram = ram; this.cpu = cpu; + this.imagePath = imagePath; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -573,6 +576,7 @@ public class Server { args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); + args.setImagePath(imagePath); args.write(prot); prot.writeMessageEnd(); } @@ -1004,7 +1008,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu); + result.success = iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath); result.setSuccessIsSet(true); return result; } @@ -1403,7 +1407,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu,resultHandler); + iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath,resultHandler); } } @@ -3855,6 +3859,7 @@ public class Server { private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-9); private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-10); private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-11); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-12); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -3873,6 +3878,7 @@ public class Server { public boolean internet; // required public long ram; // required public long cpu; // required + public String imagePath; // 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 { @@ -3886,7 +3892,8 @@ public class Server { LICENSE((short)-8, "license"), INTERNET((short)-9, "internet"), RAM((short)-10, "ram"), - CPU((short)-11, "cpu"); + CPU((short)-11, "cpu"), + IMAGE_PATH((short)-12, "imagePath"); private static final Map byName = new HashMap(); @@ -3923,6 +3930,8 @@ public class Server { return RAM; case -11: // CPU return CPU; + case -12: // IMAGE_PATH + return IMAGE_PATH; default: return null; } @@ -3993,6 +4002,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); tmpMap.put(_Fields.CPU, new org.apache.thrift.meta_data.FieldMetaData("cpu", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); + tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("imagePath", 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(writeVLdata_args.class, metaDataMap); } @@ -4011,7 +4022,8 @@ public class Server { boolean license, boolean internet, long ram, - long cpu) + long cpu, + String imagePath) { this(); this.imagename = imagename; @@ -4029,6 +4041,7 @@ public class Server { setRamIsSet(true); this.cpu = cpu; setCpuIsSet(true); + this.imagePath = imagePath; } /** @@ -4061,6 +4074,9 @@ public class Server { this.internet = other.internet; this.ram = other.ram; this.cpu = other.cpu; + if (other.isSetImagePath()) { + this.imagePath = other.imagePath; + } } public writeVLdata_args deepCopy() { @@ -4084,6 +4100,7 @@ public class Server { this.ram = 0; setCpuIsSet(false); this.cpu = 0; + this.imagePath = null; } public String getImagename() { @@ -4346,6 +4363,30 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPU_ISSET_ID, value); } + public String getImagePath() { + return this.imagePath; + } + + public writeVLdata_args setImagePath(String imagePath) { + this.imagePath = imagePath; + return this; + } + + public void unsetImagePath() { + this.imagePath = null; + } + + /** Returns true if field imagePath is set (has been assigned a value) and false otherwise */ + public boolean isSetImagePath() { + return this.imagePath != null; + } + + public void setImagePathIsSet(boolean value) { + if (!value) { + this.imagePath = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -4436,6 +4477,14 @@ public class Server { } break; + case IMAGE_PATH: + if (value == null) { + unsetImagePath(); + } else { + setImagePath((String)value); + } + break; + } } @@ -4474,6 +4523,9 @@ public class Server { case CPU: return Long.valueOf(getCpu()); + case IMAGE_PATH: + return getImagePath(); + } throw new IllegalStateException(); } @@ -4507,6 +4559,8 @@ public class Server { return isSetRam(); case CPU: return isSetCpu(); + case IMAGE_PATH: + return isSetImagePath(); } throw new IllegalStateException(); } @@ -4623,6 +4677,15 @@ public class Server { return false; } + boolean this_present_imagePath = true && this.isSetImagePath(); + boolean that_present_imagePath = true && that.isSetImagePath(); + if (this_present_imagePath || that_present_imagePath) { + if (!(this_present_imagePath && that_present_imagePath)) + return false; + if (!this.imagePath.equals(that.imagePath)) + return false; + } + return true; } @@ -4749,6 +4812,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetImagePath()).compareTo(other.isSetImagePath()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImagePath()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imagePath, other.imagePath); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -4840,6 +4913,14 @@ public class Server { sb.append("cpu:"); sb.append(this.cpu); first = false; + if (!first) sb.append(", "); + sb.append("imagePath:"); + if (this.imagePath == null) { + sb.append("null"); + } else { + sb.append(this.imagePath); + } + first = false; sb.append(")"); return sb.toString(); } @@ -4973,6 +5054,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -12: // IMAGE_PATH + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.imagePath = iprot.readString(); + struct.setImagePathIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -4988,6 +5077,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.imagePath != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.imagePath); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(CPU_FIELD_DESC); oprot.writeI64(struct.cpu); oprot.writeFieldEnd(); @@ -5086,7 +5180,10 @@ public class Server { if (struct.isSetCpu()) { optionals.set(10); } - oprot.writeBitSet(optionals, 11); + if (struct.isSetImagePath()) { + optionals.set(11); + } + oprot.writeBitSet(optionals, 12); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } @@ -5120,12 +5217,15 @@ public class Server { if (struct.isSetCpu()) { oprot.writeI64(struct.cpu); } + if (struct.isSetImagePath()) { + oprot.writeString(struct.imagePath); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -5170,6 +5270,10 @@ public class Server { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } + if (incoming.get(11)) { + struct.imagePath = iprot.readString(); + struct.setImagePathIsSet(true); + } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 9715b0a4..44f0c216 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -15,10 +15,14 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; + import org.apache.commons.io.FileUtils; import org.apache.thrift.TException; import sql.SQL; +import util.XMLCreator; public class ServerHandler implements Server.Iface { @@ -74,7 +78,7 @@ public class ServerHandler implements Server.Iface { @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 Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws TException { String login="tete"; @@ -82,8 +86,8 @@ public class ServerHandler implements Server.Iface { int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename); - + sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename, imagePath); + // TODO Auto-generated method stub return true; } @@ -184,7 +188,20 @@ public class ServerHandler implements Server.Iface { 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("creator durch"); + } 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; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 301c7d88..7eca6952 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -160,7 +160,7 @@ public class SQL { return -1; } - public boolean setImageData(Connection con, int pk_person, boolean license, boolean internet, long cpu, long ram, String imagename) + public boolean setImageData(Connection con, int pk_person, boolean license, boolean internet, long cpu, long ram, String imagename, String imagePath) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -180,7 +180,7 @@ public class SQL { Statement stm=con.createStatement(); 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+"',1,'"+imagename+"','/srv/openslx/nfs/temp/','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"',1,1,1,1,1,1,0,0,'"+license_bol+"','"+internet_bol+"','"+ram+"','"+cpu+"');"); + 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+"',1,'"+imagename+"','"+imagePath+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"',1,1,1,1,1,1,0,0,'"+license_bol+"','"+internet_bol+"','"+ram+"','"+cpu+"');"); con.commit(); } catch (SQLException e) { diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java new file mode 100644 index 00000000..0efb2465 --- /dev/null +++ b/Dozentenmodulserver/src/util/XMLCreator.java @@ -0,0 +1,213 @@ +package util; +import java.io.File; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Comment; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + + +public class XMLCreator { + + + /* This class offers methods to create XML files for the (old) version of managing VMware *.vmdks */ + + + + private Connection con = null; + private Statement st = null; + private ResultSet rs = null; + private String vmName; + private String filePath = "/srv/openslx/nfs/temp/"; + + + //phone param not existing + private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.name as os, m_VLData_lecture.admin_changeTime as time " + + "FROM bwLehrpool.m_VLData_lecture, bwLehrpool.m_VLData_imageInfo, bwLehrpool.m_user, bwLehrpool.m_operatingSystem " + + "WHERE m_user.userID = m_VLData_lecture.admin_owner " + + "AND m_VLData_imageInfo.GUID_imageID = m_VLData_lecture.imageID " + + "AND m_VLData_imageInfo.content_operatingSystem = m_operatingSystem.operatingSystemID " + + "AND m_VLData_lecture.name = "; + + + + public XMLCreator(Connection con) + { + this.con = con; + } + + public XMLCreator(Connection con, String vmName) + { + this.con = con; + this.vmName = vmName; + } + + + public boolean create() throws SQLException, ParserConfigurationException, TransformerException + { + + //System.out.println(query); + + if(con == null || vmName == null) + { + return false; + } + query += "'" + this.vmName + "';"; + + boolean success = startCreation(); + + if(success) + { + return true; + } + + return false; + + } + + //overload method for dynamic setting of param vmName instead of static context above + public boolean create(String vmName) throws SQLException, ParserConfigurationException, TransformerException + { + //System.out.println(query); + + if(con == null || vmName == null) + { + return false; + } + query += "'" + vmName + "';"; + + boolean success = startCreation(); + + if(success) + { + return true; + } + return false; + } + + + private boolean startCreation() throws SQLException, ParserConfigurationException, TransformerException + { + //get needed data from database + st = con.createStatement(); + rs = st.executeQuery(query); + rs.next(); + + //factory + DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); + + // root elements - dynamic content + Document doc = docBuilder.newDocument(); + Element rootElement = doc.createElement("settings"); + doc.appendChild(rootElement); + + Element entry = doc.createElement("eintrag"); + rootElement.appendChild(entry); + + Element prio = doc.createElement("priority"); + entry.appendChild(prio); + prio.setAttribute("param", "0"); + + Comment fComment = doc.createComment("Diesen Abschnitt ergänzen"); + entry.appendChild(fComment); + + Element imgName = doc.createElement("image_name"); + entry.appendChild(imgName); + String imagePath=rs.getString("image_path").substring(rs.getString("image_path").lastIndexOf("/")); + + imgName.setAttribute("param", imagePath); + + Element creator = doc.createElement("creator"); + entry.appendChild(creator); + creator.setAttribute("param", (rs.getString("vorname") + " " + rs.getString("nachname"))); + + Element email = doc.createElement("email"); + entry.appendChild(email); + email.setAttribute("param", rs.getString("mail")); + + //TODO check whether necessary + Element phone = doc.createElement("phone"); + entry.appendChild(phone); + phone.setAttribute("param", ""); + + Element shortDesc = doc.createElement("short_description"); + entry.appendChild(shortDesc); + shortDesc.setAttribute("param", rs.getString("shortdescription")); + + //TODO append latest change date and time + Element longDesc = doc.createElement("long_description"); + entry.appendChild(longDesc); + longDesc.setAttribute("param", rs.getString("description") + " last update: " + rs.getString("time")); + + Element os = doc.createElement("os"); + entry.appendChild(os); + os.setAttribute("param", rs.getString("os")); + + Comment sComment = doc.createComment("Diesen Abschnitt ergänzen"); + entry.appendChild(sComment); + + + //static content following - second part of xml descriptor + + + Element netwParam = doc.createElement("network"); + entry.appendChild(netwParam); + netwParam.setAttribute("param", "nat"); + + Element netcParam = doc.createElement("netcard"); + entry.appendChild(netcParam); + netcParam.setAttribute("param", "e1000"); + + + Element vm = doc.createElement("virtualmachine"); + entry.appendChild(vm); + vm.setAttribute("param", "vmware"); + + //TODO Fallunterscheidung + Element icon = doc.createElement("icon"); + entry.appendChild(icon); + icon.setAttribute("param", "windows"); + + Element active = doc.createElement("active"); + entry.appendChild(active); + active.setAttribute("param", "true"); + + Element pools = doc.createElement("pools"); + entry.appendChild(pools); + pools.setAttribute("param", "default"); + + Element enable3d = doc.createElement("enable3d"); + entry.appendChild(enable3d); + enable3d.setAttribute("param", "true"); + + + + //write virtual document to file + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + DOMSource source = new DOMSource(doc); + + StreamResult result = new StreamResult(new File(filePath+imagePath.replace("vmdk", "xml"))); //see filepath at top of class + transformer.transform(source, result); + + //cleanup + rs.close(); + st.close(); + + //return + return true; + } +} diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 75f9c26b..4c9e51fa 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -25,7 +25,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string name), - bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu), + bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), list getImageList(), list getAllOS(), map getPersonData(string Vorname, string Nachname), -- cgit v1.2.3-55-g7522 From dc5dc58cf6234889f72d52a150d1b934cbb326ec Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Apr 2014 14:12:17 +0200 Subject: Unterschiedliche kleine und größere Änderungen --- Dozentenmodul/.classpath | 1 + .../bin/GUI/EditImageAllgemein_GUI$1.class | Bin 716 -> 716 bytes .../bin/GUI/EditImageAllgemein_GUI$2.class | Bin 793 -> 793 bytes .../bin/GUI/EditImageAllgemein_GUI$3.class | Bin 833 -> 833 bytes .../bin/GUI/EditImageAllgemein_GUI$4.class | Bin 1368 -> 1841 bytes Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 8826 -> 9064 bytes .../bin/GUI/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/GUI/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/GUI/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class | Bin 8389 -> 8401 bytes .../bin/GUI/EingabeImageAllgemein_GUI$1.class | Bin 734 -> 979 bytes .../bin/GUI/EingabeImageAllgemein_GUI$2.class | Bin 811 -> 811 bytes .../bin/GUI/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 1125 bytes .../bin/GUI/EingabeImageAllgemein_GUI$4.class | Bin 1586 -> 1602 bytes .../bin/GUI/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7761 bytes .../bin/GUI/EingabeImageTechnisch_GUI.class | Bin 8391 -> 8397 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 11083 -> 11740 bytes Dozentenmodul/bin/GUI/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/GUI/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/GUI/Login_GUI$3.class | Bin 4427 -> 647 bytes Dozentenmodul/bin/GUI/Login_GUI.class | Bin 3947 -> 7734 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$1.class | Bin 662 -> 662 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$2.class | Bin 729 -> 729 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$3.class | Bin 740 -> 740 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$4.class | Bin 1840 -> 996 bytes Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 8069 -> 10767 bytes .../bin/gui/EditImageAllgemein_GUI$1.class | Bin 716 -> 716 bytes .../bin/gui/EditImageAllgemein_GUI$2.class | Bin 793 -> 793 bytes .../bin/gui/EditImageAllgemein_GUI$3.class | Bin 833 -> 833 bytes .../bin/gui/EditImageAllgemein_GUI$4.class | Bin 1368 -> 1841 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 8826 -> 9064 bytes .../bin/gui/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/gui/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/gui/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class | Bin 8389 -> 8401 bytes .../bin/gui/EingabeImageAllgemein_GUI$1.class | Bin 734 -> 979 bytes .../bin/gui/EingabeImageAllgemein_GUI$2.class | Bin 0 -> 811 bytes .../bin/gui/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 1125 bytes .../bin/gui/EingabeImageAllgemein_GUI$4.class | Bin 0 -> 1602 bytes .../bin/gui/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7761 bytes .../bin/gui/EingabeImageTechnisch_GUI.class | Bin 8391 -> 8397 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 0 -> 1449 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 0 -> 1574 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$7.class | Bin 0 -> 793 bytes Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 11083 -> 11740 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 4427 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$4.class | Bin 0 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$5.class | Bin 0 -> 644 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 3947 -> 7734 bytes Dozentenmodul/bin/gui/MainMenue_GUI$1.class | Bin 662 -> 662 bytes Dozentenmodul/bin/gui/MainMenue_GUI$10.class | Bin 0 -> 793 bytes Dozentenmodul/bin/gui/MainMenue_GUI$11.class | Bin 0 -> 1005 bytes Dozentenmodul/bin/gui/MainMenue_GUI$12.class | Bin 0 -> 1834 bytes Dozentenmodul/bin/gui/MainMenue_GUI$2.class | Bin 729 -> 729 bytes Dozentenmodul/bin/gui/MainMenue_GUI$3.class | Bin 740 -> 740 bytes Dozentenmodul/bin/gui/MainMenue_GUI$4.class | Bin 1840 -> 996 bytes Dozentenmodul/bin/gui/MainMenue_GUI$5.class | Bin 0 -> 976 bytes Dozentenmodul/bin/gui/MainMenue_GUI$6.class | Bin 0 -> 947 bytes Dozentenmodul/bin/gui/MainMenue_GUI$7.class | Bin 0 -> 1031 bytes Dozentenmodul/bin/gui/MainMenue_GUI$8.class | Bin 0 -> 973 bytes Dozentenmodul/bin/gui/MainMenue_GUI$9.class | Bin 0 -> 944 bytes Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 8069 -> 10767 bytes .../src/gui/EingabeImageTechnisch_GUI.java | 19 ++++++++++--------- 74 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/Login_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/Login_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$10.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$11.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$12.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$9.class (limited to 'Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class') diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath index d012956c..1e2dfca0 100644 --- a/Dozentenmodul/.classpath +++ b/Dozentenmodul/.classpath @@ -18,5 +18,6 @@ + diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class index 8aac918a..e01e6b79 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class index fe3aa20e..dc948767 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class index 04b61bfc..e248fd06 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class index 79d48c01..051431f2 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index fe7cbc2f..c0a38325 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class index ce51d208..dcfd7111 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class index 4439a63d..a0a6173c 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class index ed1c7c14..f5d01268 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class index 9d2ce374..21658851 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class index 929a1184..d6ce35c1 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class index b87e4c2a..979638d5 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class index 210e494d..a8301134 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class index 69b2a2a7..fb0a74b7 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class index ba01d472..af7cda76 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class index baa9e9f0..ecb1cb44 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class index ea94db00..7586f5de 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class index 9e658891..245043a2 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class index e8031c6b..c72d35c6 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class index 8a248b02..03012ec1 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class index 71928437..bd46a337 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class index 52709eee..ec900ffd 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class index a0cfa528..b4388d57 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$1.class and b/Dozentenmodul/bin/GUI/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class index ff56145f..54cd4d69 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$2.class and b/Dozentenmodul/bin/GUI/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class index aad19364..46796de6 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$3.class and b/Dozentenmodul/bin/GUI/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI.class b/Dozentenmodul/bin/GUI/Login_GUI.class index c784876c..98c862f5 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI.class and b/Dozentenmodul/bin/GUI/Login_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class index 58e4c435..57b08981 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class index 9bb444b5..77e0fbd6 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class index e2caddfd..6e35da4f 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class index 89820f94..556b11db 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class index c08f45b9..b39b43af 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class index 8aac918a..e01e6b79 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class index fe3aa20e..dc948767 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class index 04b61bfc..e248fd06 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class index 79d48c01..051431f2 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class index fe7cbc2f..c0a38325 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class index ce51d208..dcfd7111 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class index 4439a63d..a0a6173c 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class index ed1c7c14..f5d01268 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class index 9d2ce374..21658851 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class index 929a1184..d6ce35c1 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class new file mode 100644 index 00000000..979638d5 Binary files /dev/null and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class index 210e494d..a8301134 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class new file mode 100644 index 00000000..fb0a74b7 Binary files /dev/null and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class index ba01d472..af7cda76 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class index baa9e9f0..ecb1cb44 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class index ea94db00..7586f5de 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class index 9e658891..245043a2 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class index e8031c6b..c72d35c6 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class index 8a248b02..03012ec1 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class new file mode 100644 index 00000000..bd46a337 Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class new file mode 100644 index 00000000..0176a3a2 Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class new file mode 100644 index 00000000..6597ecfb Binary files /dev/null and b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class index 52709eee..ec900ffd 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index a0cfa528..b4388d57 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index ff56145f..54cd4d69 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index aad19364..46796de6 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class new file mode 100644 index 00000000..22908f76 Binary files /dev/null and b/Dozentenmodul/bin/gui/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class new file mode 100644 index 00000000..e1bf5be2 Binary files /dev/null and b/Dozentenmodul/bin/gui/Login_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index c784876c..98c862f5 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class index 58e4c435..57b08981 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class new file mode 100644 index 00000000..d339898a Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class new file mode 100644 index 00000000..1021e00c Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class new file mode 100644 index 00000000..00f3522e Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class index 9bb444b5..77e0fbd6 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class index e2caddfd..6e35da4f 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class index 89820f94..556b11db 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class and b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class new file mode 100644 index 00000000..953c5c22 Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class new file mode 100644 index 00000000..69b80c5f Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class new file mode 100644 index 00000000..cb9cbe82 Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class new file mode 100644 index 00000000..fc114f01 Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class new file mode 100644 index 00000000..60491c0b Binary files /dev/null and b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class index c08f45b9..b39b43af 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java index 62cfd19a..43482544 100644 --- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java @@ -249,8 +249,8 @@ public class EingabeImageTechnisch_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if(rdbtnInternetJa.isSelected()==true) @@ -278,13 +278,13 @@ public class EingabeImageTechnisch_GUI extends JFrame { dispose(); } }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); + cancelButton.setActionCommand("OK"); + buttonPane.add(cancelButton); + //getRootPane().setDefaultButton(cancelButton); } { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if(rdbtnInternetJa.isSelected()==true) { @@ -311,8 +311,9 @@ public class EingabeImageTechnisch_GUI extends JFrame { } }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); } } -- cgit v1.2.3-55-g7522 From 7a31f13cd386669298dfa0f91f90af63c9c2874a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Apr 2014 12:03:03 +0200 Subject: Bearbeiten von Images funktioniert nun vollständig --- .../bin/GUI/EditImageAllgemein_GUI$1.class | Bin 716 -> 837 bytes .../bin/GUI/EditImageAllgemein_GUI$2.class | Bin 793 -> 914 bytes .../bin/GUI/EditImageAllgemein_GUI$3.class | Bin 833 -> 954 bytes .../bin/GUI/EditImageAllgemein_GUI$4.class | Bin 1841 -> 1841 bytes Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 9064 -> 9064 bytes .../bin/GUI/EditImageTechnisch_GUI$1.class | Bin 716 -> 716 bytes .../bin/GUI/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/GUI/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/GUI/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class | Bin 8401 -> 8401 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class | Bin 1237 -> 1361 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class | Bin 1206 -> 1206 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class | Bin 749 -> 749 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class | Bin 1263 -> 1515 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI.class | Bin 9431 -> 9476 bytes Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 10767 -> 10763 bytes Dozentenmodul/bin/Models/vm.class | Bin 2060 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$1.class | Bin 716 -> 837 bytes .../bin/gui/EditImageAllgemein_GUI$2.class | Bin 793 -> 914 bytes .../bin/gui/EditImageAllgemein_GUI$3.class | Bin 833 -> 954 bytes .../bin/gui/EditImageAllgemein_GUI$4.class | Bin 1841 -> 1841 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 9064 -> 9064 bytes .../bin/gui/EditImageTechnisch_GUI$1.class | Bin 716 -> 716 bytes .../bin/gui/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/gui/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/gui/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class | Bin 8401 -> 8401 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class | Bin 1237 -> 1361 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class | Bin 1206 -> 1206 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class | Bin 749 -> 749 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class | Bin 1263 -> 1515 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class | Bin 805 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI.class | Bin 9431 -> 9476 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class | Bin 758 -> 758 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class | Bin 1217 -> 1217 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class | Bin 1336 -> 1336 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class | Bin 763 -> 763 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class | Bin 1473 -> 1473 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class | Bin 1599 -> 1599 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI.class | Bin 10407 -> 10892 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 647 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$4.class | Bin 647 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$5.class | Bin 644 -> 644 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 7734 -> 7734 bytes Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 10767 -> 10763 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class | Bin 819 -> 819 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class | Bin 1249 -> 1249 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class | Bin 887 -> 887 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class | Bin 1252 -> 1252 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class | Bin 896 -> 896 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class | Bin 1340 -> 1729 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class | Bin 935 -> 1839 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class | Bin 938 -> 938 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class | Bin 1608 -> 1970 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI.class | Bin 11819 -> 11819 bytes Dozentenmodul/bin/models/SessionData.class | Bin 0 -> 1041 bytes Dozentenmodul/bin/models/vm.class | Bin 2060 -> 0 bytes Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java | 4 +- Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java | 1 + Dozentenmodul/src/GUI/FTPDownloader_GUI.java | 44 ++-- Dozentenmodul/src/GUI/Login_GUI.java | 7 +- Dozentenmodul/src/GUI/MainMenue_GUI.java | 2 +- Dozentenmodul/src/Models/vm.java | 69 ------ Dozentenmodul/src/gui/EditImageAllgemein_GUI.java | 4 +- Dozentenmodul/src/gui/EditImageTechnisch_GUI.java | 1 + Dozentenmodul/src/gui/FTPDownloader_GUI.java | 44 ++-- Dozentenmodul/src/gui/FTPEditUploader_GUI.java | 11 +- Dozentenmodul/src/gui/Login_GUI.java | 7 +- Dozentenmodul/src/gui/MainMenue_GUI.java | 2 +- Dozentenmodul/src/gui/SearchEditImage_GUI.java | 73 ++++--- Dozentenmodul/src/models/SessionData.java | 28 +++ Dozentenmodul/src/models/vm.java | 69 ------ .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 2993 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 2945 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 3332 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 3246 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3157 -> 3267 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 3863 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4410 -> 4410 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4241 -> 4241 bytes .../bin/server/Server$AsyncClient.class | Bin 7922 -> 7947 bytes .../bin/server/Server$AsyncIface.class | Bin 1425 -> 1425 bytes .../Server$AsyncProcessor$DeleteFtpUser$1.class | Bin 2969 -> 2969 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS$1.class | Bin 2997 -> 2997 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../Server$AsyncProcessor$getFtpUser$1.class | Bin 2851 -> 2851 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData$1.class | Bin 3081 -> 3081 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList$1.class | Bin 3021 -> 3021 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData$1.class | Bin 3099 -> 3099 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getPathOfImage$1.class | Bin 2907 -> 2907 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3128 -> 3174 bytes .../Server$AsyncProcessor$getPersonData$1.class | Bin 3090 -> 3090 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy$1.class | Bin 2984 -> 2984 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData$1.class | Bin 3002 -> 3002 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata$1.class | Bin 3011 -> 3011 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../Server$AsyncProcessor$writeVLdata$1.class | Bin 2966 -> 2966 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3490 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3280 -> 3280 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 14082 -> 14166 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 1595 -> 1613 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 2036 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2014 -> 2060 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 2279 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2563 -> 2563 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2390 -> 2390 bytes .../bin/server/Server$Processor.class | Bin 3113 -> 3113 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3462 -> 3462 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 10610 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3007 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2640 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2124 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 9481 -> 10797 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 3587 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 3944 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3289 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 18468 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4053 -> 4053 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 4862 -> 4862 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4056 -> 4056 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 24604 -> 24604 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3914 -> 3914 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4637 -> 4637 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 3886 -> 3886 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 23310 -> 23310 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 9540 -> 9802 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 11593 -> 11637 bytes Dozentenmodulserver/src/server/Server.java | 238 +++++++++++++++------ Dozentenmodulserver/src/server/ServerHandler.java | 16 +- Dozentenmodulserver/src/sql/SQL.java | 4 +- Dozentenmodulserver/thrift/server.thrift | 2 +- 279 files changed, 334 insertions(+), 292 deletions(-) delete mode 100644 Dozentenmodul/bin/Models/vm.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class create mode 100644 Dozentenmodul/bin/models/SessionData.class delete mode 100644 Dozentenmodul/bin/models/vm.class delete mode 100644 Dozentenmodul/src/Models/vm.java create mode 100644 Dozentenmodul/src/models/SessionData.java delete mode 100644 Dozentenmodul/src/models/vm.java (limited to 'Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class') diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class index e01e6b79..062a5aeb 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class index dc948767..9d0a3bea 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class index e248fd06..69507f5e 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class index 051431f2..e7af4c13 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index c0a38325..2287ca1a 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class index b17e4eea..3ed6a8ca 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class index dcfd7111..c334f61e 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class index a0a6173c..0c45cb47 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class index f5d01268..6b0b0760 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class index 21658851..182e34ea 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class index dabb4fbf..3067718e 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class index f030114b..41ad1e3f 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class index b1f9edc1..2af3aa99 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class index fbed3457..6f093d26 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class index a6af82a6..0d64e048 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class index b39b43af..9c8c5535 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/Models/vm.class b/Dozentenmodul/bin/Models/vm.class deleted file mode 100644 index 58709544..00000000 Binary files a/Dozentenmodul/bin/Models/vm.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class index e01e6b79..062a5aeb 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class index dc948767..9d0a3bea 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class index e248fd06..69507f5e 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class index 051431f2..e7af4c13 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class index c0a38325..2287ca1a 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class index b17e4eea..3ed6a8ca 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class index dcfd7111..c334f61e 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class index a0a6173c..0c45cb47 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class index f5d01268..6b0b0760 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class index 21658851..182e34ea 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class index dabb4fbf..3067718e 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class index f030114b..41ad1e3f 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class index b1f9edc1..2af3aa99 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class index fbed3457..6f093d26 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class deleted file mode 100644 index ffe0c1c4..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class index a6af82a6..0d64e048 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class index 9fa18b77..3f952241 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class index c79031a8..0bff908a 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class index dc628f0a..7bafe65d 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class index 7aa1908d..a0883626 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class index 01834329..034411c3 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class index 9ebb41ee..043a33a4 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class index fc6e665a..a3da591f 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index 47818348..b4388d57 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index 41243cbe..54cd4d69 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index 3122e95a..46796de6 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class index 25dcca5e..22908f76 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$4.class and b/Dozentenmodul/bin/gui/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class index 102f386f..e1bf5be2 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$5.class and b/Dozentenmodul/bin/gui/Login_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index 90a674be..da10a7ca 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class index b39b43af..9c8c5535 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class index f7677e0d..4c8a49ba 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class index 0e0f3195..0bb68dce 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class index 3764900b..414b3a0c 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class index e446614e..8ec22cf9 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class index 1f2e2007..1758ada3 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class index ae739673..b89857f4 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class index 5ff30dec..ca1774f7 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class index 2b56e122..08d744bd 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class index 92895e7c..00e112de 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class index ae28eddc..c562cc42 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/models/SessionData.class b/Dozentenmodul/bin/models/SessionData.class new file mode 100644 index 00000000..f0ff4996 Binary files /dev/null and b/Dozentenmodul/bin/models/SessionData.class differ diff --git a/Dozentenmodul/bin/models/vm.class b/Dozentenmodul/bin/models/vm.class deleted file mode 100644 index 58709544..00000000 Binary files a/Dozentenmodul/bin/models/vm.class and /dev/null differ diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ b/Dozentenmodul/src/GUI/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java index 621f6561..e68e4bbd 100644 --- a/Dozentenmodul/src/GUI/MainMenue_GUI.java +++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + "\"Programmieren\"."); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png"))); + .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png"))); // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/Models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java index 9f073993..e7252898 100644 --- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java @@ -15,6 +15,10 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -30,6 +34,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -348,7 +353,11 @@ public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListene // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); task.addPropertyChangeListener(this); diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java index 9b10cb3c..11783d60 100644 --- a/Dozentenmodul/src/gui/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + "\"Programmieren\"."); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png"))); + .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png"))); // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java index dbe23115..dbc2562c 100644 --- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java @@ -25,6 +25,7 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; @@ -44,6 +45,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -51,6 +53,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; + @SuppressWarnings("serial") public class SearchEditImage_GUI extends JFrame { @@ -269,14 +272,14 @@ public class SearchEditImage_GUI extends JFrame { System.out.println(tabbedPane.getSelectedIndex()); if(tabbedPane.getSelectedIndex()==0){ - - + String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname(); + //String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); } else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + + - //rowSorterMyImages.toggleSortOrder(0); } } @@ -284,17 +287,7 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages=new JTable(); @@ -305,13 +298,23 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages=new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); tableAllImages.setRowSorter(rowSorterAll); scrollPaneAllImages.setViewportView(tableAllImages); tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages=new JTable(); @@ -359,10 +362,27 @@ public class SearchEditImage_GUI extends JFrame { btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { //Öffnet den Downloader - con.closeThriftConnection(); - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - SearchEditImage_GUI.this.setVisible(false); + + if(tablemyImages.getSelectedRow()!=-1) + { + String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchEditImage_GUI.this.setVisible(false); + FTPDownloader_GUI down=new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + + + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); btnDownload.setBounds(449, 508, 118, 23); @@ -395,7 +415,7 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); //Image.image.setImageId(imageid); - + if(tabbedPane.getSelectedIndex()==0){ String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); Image.image.setImageId(imageid); @@ -405,7 +425,12 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); ea.setVisible(true); - dispose(); + dispose(); + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); cancelButton.setActionCommand("Cancel"); diff --git a/Dozentenmodul/src/models/SessionData.java b/Dozentenmodul/src/models/SessionData.java new file mode 100644 index 00000000..3b91e1a2 --- /dev/null +++ b/Dozentenmodul/src/models/SessionData.java @@ -0,0 +1,28 @@ +package models; + +public class SessionData { + private String sessionID; + private String authToken; + private String serverAdress; + public static SessionData session =new SessionData(); + public String getSessionID() { + return sessionID; + } + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + public String getAuthToken() { + return authToken; + } + public void setAuthToken(String authToken) { + this.authToken = authToken; + } + public String getServerAdress() { + return serverAdress; + } + public void setServerAdress(String serverAdress) { + this.serverAdress = serverAdress; + } + + +} diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 54ae8fb1..c1800d22 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index dcf9e658..48553784 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 636d50e6..b8323939 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 52b62ee2..5cb5de5d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 47bcd119..63c6a21f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index b9cb1ea4..ddd3d393 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index 2e0afed7..7950930a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index cd52da88..78eb762b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 2c9e4c7e..21fe734c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 590c2bcd..d859e5eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index 7f8ae8c6..f640d332 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index ad0574c6..fd5b9f34 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 13538c1f..271671b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 635c53c0..7a20bd38 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index 3f738078..d71ce22c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class index 6290a004..856e294b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index ba289f63..3cd6ad96 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class index 3fbb8677..39d581c1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index edb1bcec..bd52eea0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class index 40306c0d..ba3bdbd2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index c732068a..da1f03e1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class index 45589df3..d55d3ada 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index b6a19652..ffaa56da 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class index 7088768e..5c3233af 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index aa7ecc5b..1847f9fc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class index dd89977c..0600e248 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 705a33c7..a8b40f25 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class index 89af670d..523a7cac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 2471001a..41778940 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class index 693325cd..e6f24939 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index ae81f238..9ac0adfc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class index 61e06f52..8dbe83a5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index b2db8d99..6944248e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class index c2c2ca58..e3710c4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index 2d438884..b43c5d99 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class index f2b57fb7..85c70822 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index 60246d3e..aa0c2bb0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class index c495d813..84459dd2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index 08f594ca..beb8edc7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index 31a856b1..d2415e28 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index 2fed4f2f..6e968f98 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index 0fb66c0d..9a167a57 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index ce5024d6..03738f7d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index cda02dce..f20a6e31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index a53a5690..4670da03 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 4c817ea4..4db3ad31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index 0485efb4..3e6204bd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index 06122d58..a7bbdba0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index a39d1d63..c8b71d4b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index 69232dd9..6432b5c3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 6b95e144..30f714b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index b48d1db8..064806c5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index ba4b4c81..203f4dc5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index 974ce04a..49ac3bf2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index af38e742..85a22072 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index a190c32b..bd6b1acd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index 890e8213..5b8a4fd8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index 8d491ab8..7508d6ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index f48d16cd..75ff5688 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 40177d04..9c351438 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index d10aedf6..c3124a38 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 8c9f3d14..cd59b0f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index c3cfe04b..2f1e0ac9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 5af2dce3..9752e403 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 94eec707..1a9bac88 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index 4b3ca880..f8d11519 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 8cb3e809..bf902019 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 16a4aceb..1057b97e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index abae47eb..578ade0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 4b06ae93..28058f19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index d01fdf1c..814bcfa6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index bb5e97c4..f5511eb0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index 42042b94..1c09f788 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index f4fabf54..4d4fe750 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index 348ca927..af2aa623 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index 22764a7a..d8f6bbf0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 6a582eda..f00be9db 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index be92db51..3ace2f05 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index e3af306c..eeb6040c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 77822f8b..dbdae7d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index d290e233..086d09f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 087be9cb..cacf4480 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 165ca1fd..8abcae75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index 01f278f2..6939ee7f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index 078a92a2..3e5a664e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 1e27cb2b..fb65b77d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index cf9f1a46..4b018be0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index 910a07be..0795b7e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index e0c90c41..4c6efd43 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index ea0aac68..c6a6e919 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 1dc1acbe..fcd2a6e8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index b2b736b9..ff266614 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index 46040508..6a169867 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index 0261ca03..aa8c8782 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index 61f1504d..eb813265 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index 3968c27f..4e5db36b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index 87f255d2..8c209f6e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 6b0de404..b2aea627 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index 0fddf45d..245feb39 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index c33d93c8..bd467f21 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 5a78bea3..bd282c28 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 0a37b52c..41d42e5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index b32073e2..9aa46e2a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index c9602e72..c4c92fa2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index b094d83f..619c402c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index 4e0eac29..60297af0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index 37d2bfce..428fae5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index d3a5e629..05f65927 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 677cf6e7..34bbc442 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index a0e50f65..f3420fe0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index de271782..a03c7f1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index 2cff3f79..c261b461 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index caf4f5ab..0c0ed4c5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index 4bc03b1b..45b70561 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index d421488d..f47d4cbc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index 4eec1f61..865faf19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 25714de2..c090fc0e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 9878f82f..a340c2d7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index 820047ed..9339c0ef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index e2615b10..0da12764 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index a99172e0..f253f3a5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index a09507c2..5d53f238 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index a9efd658..23866029 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index c5d3070a..6dc7b5da 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index f84046fd..41a74b93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index a0e39f19..dc7273ba 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index 18f2f747..08ce25c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 23a1b04e..5333ed09 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 2bf508fe..6cbca529 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index 72c0e132..be51def7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index 465e526f..8d0a0924 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 99a1ca2c..8482847c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 3d83b674..5079da9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index cf401688..b54cfa9d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 20c33f69..a86952f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index d39b5eaa..4bcff3bb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index cd64d091..367e4623 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index a6a046a9..eee29d0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index 5ca4e662..c13e4186 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index 22767aa5..fc535bbf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 8c3ee771..fc7ae567 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index ec794b93..b5a7bc52 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 7f78ba17..1e0320f7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index 80170c5f..89abe9ff 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index e36694de..1730bb78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index bafaca4a..730620cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index 0e90f432..479b2e8b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index fe9789e5..f696fbb9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 472541ab..fbf10c75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index 5784027a..25c867fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index 1a12ac16..d4d78880 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index 3b6a1df1..83f69338 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index 11278b31..fcd686f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index 2a2b9950..56520559 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index bbc8f5de..688721d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 0e463eef..08600baa 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index f6ac5397..5c6311ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index f8694799..d0eba733 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index 928375bd..d90eb444 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index 883e1b4c..63a16e25 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index 435037e1..80275e4d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index 63574fda..8ead4fa2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index 1503f186..df1529ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index a1aecc8d..4ea61056 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 8f15a17a..964d6b01 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index 09aeb14d..c1bec473 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index d6f97faf..7d8a670d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 12c2a78a..71b88e4a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index 2b2ce43d..086fee05 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index 631bfe6d..a832a1e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index 4fb7b29b..afcc0d29 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 57bf3c1c..6d3d00f4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 21152e10..00d9d1cb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index 7b995a7c..1d8e43a3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index bb71f7a1..362cb964 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index 4af3c48a..e258e397 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index df06ff1d..ea44acdd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index de652ba4..5e2df842 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index f17f52a2..04efdd42 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index da9eda5a..2cc5730a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index adb3ed9f..ad694d39 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index ee51aabf..7b8d6740 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 36303474..a614b4ac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index 718cff17..a00d86cc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index adf5624f..ce6b1b4e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index 6e02ab65..8cfc248d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index 2190e109..e166b718 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 9dcbd40e..aeaa0c9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index eddcd8b6..ed7ec808 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index b0441555..d303e701 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index 9360cad9..9ceaa0f6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index 89beaed4..6e21638f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index 5e5afdca..aa46286f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 94197262..4e5309b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index b3416972..18c392c1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index ee35f096..0538e8bc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 0106166e..71694b8e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 8a73f7e2..cdd9ded1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index ed2fb7df..6ed4f413 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 4bb45a96..b9a7519e 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index c2a0c5c9..b3c6fccb 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 9994fcb4..558729d1 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -40,7 +40,7 @@ public class Server { public long DeleteFtpUser(String user) throws org.apache.thrift.TException; - public String getPathOfImage(String name) throws org.apache.thrift.TException; + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; @@ -68,7 +68,7 @@ public class Server { public void DeleteFtpUser(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -155,16 +155,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "DeleteFtpUser failed: unknown result"); } - public String getPathOfImage(String name) throws org.apache.thrift.TException + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { - send_getPathOfImage(name); + send_getPathOfImage(image_id, version); return recv_getPathOfImage(); } - public void send_getPathOfImage(String name) throws org.apache.thrift.TException + public void send_getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); sendBase("getPathOfImage", args); } @@ -494,24 +495,27 @@ public class Server { } } - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPathOfImage_call method_call = new getPathOfImage_call(name, resultHandler, this, ___protocolFactory, ___transport); + getPathOfImage_call method_call = new getPathOfImage_call(image_id, version, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getPathOfImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String name; - public getPathOfImage_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String image_id; + private String version; + public getPathOfImage_call(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.name = name; + this.image_id = image_id; + this.version = version; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getPathOfImage", org.apache.thrift.protocol.TMessageType.CALL, 0)); getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); args.write(prot); prot.writeMessageEnd(); } @@ -988,7 +992,7 @@ public class Server { public getPathOfImage_result getResult(I iface, getPathOfImage_args args) throws org.apache.thrift.TException { getPathOfImage_result result = new getPathOfImage_result(); - result.success = iface.getPathOfImage(args.name); + result.success = iface.getPathOfImage(args.image_id, args.version); return result; } } @@ -1355,7 +1359,7 @@ public class Server { } public void start(I iface, getPathOfImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.getPathOfImage(args.name,resultHandler); + iface.getPathOfImage(args.image_id, args.version,resultHandler); } } @@ -3140,7 +3144,8 @@ public class Server { public static class getPathOfImage_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathOfImage_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("image_id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -3148,11 +3153,13 @@ public class Server { schemes.put(TupleScheme.class, new getPathOfImage_argsTupleSchemeFactory()); } - public String name; // required + public String image_id; // required + public String version; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"); + IMAGE_ID((short)-1, "image_id"), + VERSION((short)-2, "version"); private static final Map byName = new HashMap(); @@ -3167,8 +3174,10 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME - return NAME; + case -1: // IMAGE_ID + return IMAGE_ID; + case -2: // VERSION + return VERSION; default: return null; } @@ -3212,7 +3221,9 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("image_id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathOfImage_args.class, metaDataMap); @@ -3222,18 +3233,23 @@ public class Server { } public getPathOfImage_args( - String name) + String image_id, + String version) { this(); - this.name = name; + this.image_id = image_id; + this.version = version; } /** * Performs a deep copy on other. */ public getPathOfImage_args(getPathOfImage_args other) { - if (other.isSetName()) { - this.name = other.name; + if (other.isSetImage_id()) { + this.image_id = other.image_id; + } + if (other.isSetVersion()) { + this.version = other.version; } } @@ -3243,40 +3259,73 @@ public class Server { @Override public void clear() { - this.name = null; + this.image_id = null; + this.version = null; } - public String getName() { - return this.name; + public String getImage_id() { + return this.image_id; } - public getPathOfImage_args setName(String name) { - this.name = name; + public getPathOfImage_args setImage_id(String image_id) { + this.image_id = image_id; return this; } - public void unsetName() { - this.name = null; + public void unsetImage_id() { + this.image_id = null; } - /** Returns true if field name is set (has been assigned a value) and false otherwise */ - public boolean isSetName() { - return this.name != null; + /** Returns true if field image_id is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_id() { + return this.image_id != null; } - public void setNameIsSet(boolean value) { + public void setImage_idIsSet(boolean value) { if (!value) { - this.name = null; + this.image_id = null; + } + } + + public String getVersion() { + return this.version; + } + + public getPathOfImage_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case NAME: + case IMAGE_ID: if (value == null) { - unsetName(); + unsetImage_id(); } else { - setName((String)value); + setImage_id((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); } break; @@ -3285,8 +3334,11 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case NAME: - return getName(); + case IMAGE_ID: + return getImage_id(); + + case VERSION: + return getVersion(); } throw new IllegalStateException(); @@ -3299,8 +3351,10 @@ public class Server { } switch (field) { - case NAME: - return isSetName(); + case IMAGE_ID: + return isSetImage_id(); + case VERSION: + return isSetVersion(); } throw new IllegalStateException(); } @@ -3318,12 +3372,21 @@ public class Server { if (that == null) return false; - boolean this_present_name = true && this.isSetName(); - boolean that_present_name = true && that.isSetName(); - if (this_present_name || that_present_name) { - if (!(this_present_name && that_present_name)) + boolean this_present_image_id = true && this.isSetImage_id(); + boolean that_present_image_id = true && that.isSetImage_id(); + if (this_present_image_id || that_present_image_id) { + if (!(this_present_image_id && that_present_image_id)) return false; - if (!this.name.equals(that.name)) + if (!this.image_id.equals(that.image_id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) return false; } @@ -3343,12 +3406,22 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = Boolean.valueOf(isSetImage_id()).compareTo(other.isSetImage_id()); if (lastComparison != 0) { return lastComparison; } - if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); + if (isSetImage_id()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_id, other.image_id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); if (lastComparison != 0) { return lastComparison; } @@ -3373,11 +3446,19 @@ public class Server { StringBuilder sb = new StringBuilder("getPathOfImage_args("); boolean first = true; - sb.append("name:"); - if (this.name == null) { + sb.append("image_id:"); + if (this.image_id == null) { sb.append("null"); } else { - sb.append(this.name); + sb.append(this.image_id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); } first = false; sb.append(")"); @@ -3423,10 +3504,18 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case -1: // IMAGE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3446,9 +3535,14 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.image_id != null) { + oprot.writeFieldBegin(IMAGE_ID_FIELD_DESC); + oprot.writeString(struct.image_id); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -3469,22 +3563,32 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetName()) { + if (struct.isSetImage_id()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); - if (struct.isSetName()) { - oprot.writeString(struct.name); + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetImage_id()) { + oprot.writeString(struct.image_id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index dccda971..26a1967b 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -68,10 +68,20 @@ public class ServerHandler implements Server.Iface { return ret; } - @Override - public String getPathOfImage(String name) throws TException { - // TODO Auto-generated method stub + public String getPathOfImage(String image_id, String version) throws TException { + + try { + ResultSet rs=sql.getPathOfImage(con, image_id, version); + System.out.println("Path SQL erfolgreich"); + rs.next(); + System.out.println(rs.getString("image_path")); + return rs.getString("image_path"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 7eca6952..a93f35b0 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -82,12 +82,12 @@ public class SQL { return null; } - public ResultSet getPathOfImage(Connection con, String image_name) + public ResultSet getPathOfImage(Connection con, String image_id, String version) { try { Statement stm=con.createStatement(); - return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where image_name like '"+image_name+"';"); + return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID='"+image_id+"' and imageVersion='"+version+"';"); } catch (SQLException e) { diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 4c9e51fa..7ed807fa 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -24,7 +24,7 @@ struct Image{ service Server{ User getFtpUser(), int DeleteFtpUser(string user), - string getPathOfImage(string name), + string getPathOfImage(string image_id,string version), bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), list getImageList(), list getAllOS(), -- cgit v1.2.3-55-g7522 From 54e068bdef858a1fd601ddd3f24e0c730b4be4ee Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Apr 2014 10:47:01 +0200 Subject: Unterordner hinzugefügt und überflüssige Imports gelöscht --- .../.settings/org.eclipse.core.resources.prefs | 2 +- Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class | Bin 680 -> 0 bytes Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class | Bin 1794 -> 0 bytes Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class | Bin 929 -> 0 bytes Dozentenmodul/bin/GUI/BillOfRights_GUI.class | Bin 10791 -> 0 bytes .../bin/GUI/EditImageAllgemein_GUI$1.class | Bin 837 -> 0 bytes .../bin/GUI/EditImageAllgemein_GUI$2.class | Bin 914 -> 0 bytes .../bin/GUI/EditImageAllgemein_GUI$3.class | Bin 954 -> 0 bytes .../bin/GUI/EditImageAllgemein_GUI$4.class | Bin 1841 -> 0 bytes Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 9064 -> 0 bytes .../bin/GUI/EditImageTechnisch_GUI$1.class | Bin 716 -> 0 bytes .../bin/GUI/EditImageTechnisch_GUI$2.class | Bin 793 -> 0 bytes .../bin/GUI/EditImageTechnisch_GUI$3.class | Bin 1623 -> 0 bytes .../bin/GUI/EditImageTechnisch_GUI$4.class | Bin 1611 -> 0 bytes Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class | Bin 8401 -> 0 bytes .../bin/GUI/EingabeImageAllgemein_GUI$1.class | Bin 979 -> 0 bytes .../bin/GUI/EingabeImageAllgemein_GUI$2.class | Bin 811 -> 0 bytes .../bin/GUI/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 0 bytes .../bin/GUI/EingabeImageAllgemein_GUI$4.class | Bin 1602 -> 0 bytes .../bin/GUI/EingabeImageAllgemein_GUI.class | Bin 7761 -> 0 bytes .../bin/GUI/EingabeImageTechnisch_GUI$1.class | Bin 734 -> 0 bytes .../bin/GUI/EingabeImageTechnisch_GUI$2.class | Bin 811 -> 0 bytes .../bin/GUI/EingabeImageTechnisch_GUI$3.class | Bin 1639 -> 0 bytes .../bin/GUI/EingabeImageTechnisch_GUI$4.class | Bin 1619 -> 0 bytes .../bin/GUI/EingabeImageTechnisch_GUI.class | Bin 8754 -> 0 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$1.class | Bin 1035 -> 0 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$2.class | Bin 859 -> 0 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 928 -> 0 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 925 -> 0 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI.class | Bin 10791 -> 0 bytes Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class | Bin 6375 -> 0 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class | Bin 1361 -> 0 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class | Bin 1206 -> 0 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class | Bin 749 -> 0 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class | Bin 1515 -> 0 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI.class | Bin 9476 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class | Bin 738 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class | Bin 1193 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1564 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1633 -> 0 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 12001 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$1.class | Bin 895 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$2.class | Bin 1457 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$3.class | Bin 730 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$4.class | Bin 1478 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$5.class | Bin 739 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$6.class | Bin 942 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$7.class | Bin 3172 -> 0 bytes Dozentenmodul/bin/GUI/LinkImage_GUI.class | Bin 11346 -> 0 bytes Dozentenmodul/bin/GUI/Login_GUI$1.class | Bin 1082 -> 0 bytes Dozentenmodul/bin/GUI/Login_GUI$2.class | Bin 635 -> 0 bytes Dozentenmodul/bin/GUI/Login_GUI$3.class | Bin 647 -> 0 bytes Dozentenmodul/bin/GUI/Login_GUI.class | Bin 7734 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$1.class | Bin 662 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$2.class | Bin 729 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$3.class | Bin 740 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$4.class | Bin 1058 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 10887 -> 0 bytes Dozentenmodul/bin/GUI/SearchImage_GUI$1.class | Bin 674 -> 0 bytes Dozentenmodul/bin/GUI/SearchImage_GUI.class | Bin 11734 -> 0 bytes Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class | Bin 680 -> 0 bytes Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class | Bin 757 -> 0 bytes Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class | Bin 797 -> 0 bytes Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class | Bin 965 -> 0 bytes Dozentenmodul/bin/GUI/SearchMethod_GUI.class | Bin 6910 -> 0 bytes Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class | Bin 665 -> 0 bytes Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class | Bin 1126 -> 0 bytes Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class | Bin 1767 -> 0 bytes Dozentenmodul/bin/GUI/VmWareLink_GUI.class | Bin 5269 -> 0 bytes Dozentenmodul/bin/ftp/DownloadTask.class | Bin 3839 -> 3851 bytes Dozentenmodul/bin/gui/BillOfRights_GUI$1.class | Bin 680 -> 0 bytes Dozentenmodul/bin/gui/BillOfRights_GUI$2.class | Bin 1794 -> 0 bytes Dozentenmodul/bin/gui/BillOfRights_GUI$3.class | Bin 929 -> 0 bytes Dozentenmodul/bin/gui/BillOfRights_GUI.class | Bin 10791 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$1.class | Bin 674 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$2.class | Bin 1221 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$3.class | Bin 742 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$4.class | Bin 1228 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$5.class | Bin 751 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$6.class | Bin 1316 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$7.class | Bin 790 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$8.class | Bin 809 -> 0 bytes Dozentenmodul/bin/gui/DeleteImage_GUI.class | Bin 11325 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$1.class | Bin 837 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$2.class | Bin 914 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$3.class | Bin 954 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$4.class | Bin 1841 -> 0 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 9064 -> 0 bytes .../bin/gui/EditImageTechnisch_GUI$1.class | Bin 716 -> 0 bytes .../bin/gui/EditImageTechnisch_GUI$2.class | Bin 793 -> 0 bytes .../bin/gui/EditImageTechnisch_GUI$3.class | Bin 1623 -> 0 bytes .../bin/gui/EditImageTechnisch_GUI$4.class | Bin 1611 -> 0 bytes Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class | Bin 8401 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class | Bin 686 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class | Bin 1481 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class | Bin 754 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class | Bin 1502 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class | Bin 763 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class | Bin 805 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class | Bin 2426 -> 0 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI.class | Bin 11337 -> 0 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$1.class | Bin 764 -> 0 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$2.class | Bin 841 -> 0 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$3.class | Bin 1874 -> 0 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$4.class | Bin 1874 -> 0 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI.class | Bin 9967 -> 0 bytes .../bin/gui/EingabeImageAllgemein_GUI$1.class | Bin 979 -> 0 bytes .../bin/gui/EingabeImageAllgemein_GUI$2.class | Bin 811 -> 0 bytes .../bin/gui/EingabeImageAllgemein_GUI$3.class | Bin 1125 -> 0 bytes .../bin/gui/EingabeImageAllgemein_GUI$4.class | Bin 1602 -> 0 bytes .../bin/gui/EingabeImageAllgemein_GUI.class | Bin 7761 -> 0 bytes .../bin/gui/EingabeImageTechnisch_GUI$1.class | Bin 734 -> 0 bytes .../bin/gui/EingabeImageTechnisch_GUI$2.class | Bin 811 -> 0 bytes .../bin/gui/EingabeImageTechnisch_GUI$3.class | Bin 1639 -> 0 bytes .../bin/gui/EingabeImageTechnisch_GUI$4.class | Bin 1619 -> 0 bytes .../bin/gui/EingabeImageTechnisch_GUI.class | Bin 8754 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$1.class | Bin 1035 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$2.class | Bin 859 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 928 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 925 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$5.class | Bin 1911 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$6.class | Bin 3031 -> 0 bytes .../gui/EingabeVeranstaltungAllgemein_GUI.class | Bin 10791 -> 0 bytes Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class | Bin 692 -> 0 bytes Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class | Bin 833 -> 0 bytes Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class | Bin 813 -> 0 bytes Dozentenmodul/bin/gui/ExtendedSearch_GUI.class | Bin 6375 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class | Bin 1361 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class | Bin 1206 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class | Bin 749 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class | Bin 1515 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI.class | Bin 9476 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class | Bin 758 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class | Bin 1217 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class | Bin 1336 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class | Bin 763 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class | Bin 1473 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class | Bin 1599 -> 0 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI.class | Bin 10892 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$1.class | Bin 738 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$2.class | Bin 1193 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1564 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 1633 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 1574 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$7.class | Bin 793 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$8.class | Bin 814 -> 0 bytes Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 12001 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$1.class | Bin 895 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$2.class | Bin 1457 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$3.class | Bin 730 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$4.class | Bin 1478 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$5.class | Bin 739 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$6.class | Bin 942 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI$7.class | Bin 3172 -> 0 bytes Dozentenmodul/bin/gui/LinkImage_GUI.class | Bin 11346 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 647 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI$4.class | Bin 647 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI$5.class | Bin 644 -> 0 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 7734 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$1.class | Bin 662 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$10.class | Bin 793 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$11.class | Bin 1068 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$12.class | Bin 1816 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$2.class | Bin 729 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$3.class | Bin 740 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$4.class | Bin 1058 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$5.class | Bin 976 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$6.class | Bin 947 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$7.class | Bin 1038 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$8.class | Bin 1053 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI$9.class | Bin 944 -> 0 bytes Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 10887 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class | Bin 819 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class | Bin 1249 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class | Bin 887 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class | Bin 1252 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class | Bin 896 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class | Bin 1729 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class | Bin 1839 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class | Bin 938 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class | Bin 1970 -> 0 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI.class | Bin 11819 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$1.class | Bin 831 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$2.class | Bin 1265 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$3.class | Bin 899 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$4.class | Bin 908 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$5.class | Bin 1743 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$6.class | Bin 950 -> 0 bytes .../bin/gui/SearchEditLecture_GUI$7.class | Bin 2992 -> 0 bytes Dozentenmodul/bin/gui/SearchEditLecture_GUI.class | Bin 11376 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$1.class | Bin 674 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$2.class | Bin 1237 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$3.class | Bin 742 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$4.class | Bin 1244 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$5.class | Bin 751 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$6.class | Bin 1324 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$7.class | Bin 790 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$8.class | Bin 793 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI$9.class | Bin 930 -> 0 bytes Dozentenmodul/bin/gui/SearchImage_GUI.class | Bin 11734 -> 0 bytes Dozentenmodul/bin/gui/SearchMethod_GUI$1.class | Bin 680 -> 0 bytes Dozentenmodul/bin/gui/SearchMethod_GUI$2.class | Bin 757 -> 0 bytes Dozentenmodul/bin/gui/SearchMethod_GUI$3.class | Bin 797 -> 0 bytes Dozentenmodul/bin/gui/SearchMethod_GUI$4.class | Bin 965 -> 0 bytes Dozentenmodul/bin/gui/SearchMethod_GUI.class | Bin 6910 -> 0 bytes Dozentenmodul/bin/gui/VmWareLink_GUI$1.class | Bin 665 -> 0 bytes Dozentenmodul/bin/gui/VmWareLink_GUI$2.class | Bin 1126 -> 0 bytes Dozentenmodul/bin/gui/VmWareLink_GUI$3.class | Bin 1767 -> 0 bytes Dozentenmodul/bin/gui/VmWareLink_GUI$4.class | Bin 785 -> 0 bytes Dozentenmodul/bin/gui/VmWareLink_GUI.class | Bin 5269 -> 0 bytes .../bin/gui/image/DeleteImage_GUI$1.class | Bin 0 -> 704 bytes .../bin/gui/image/DeleteImage_GUI$2.class | Bin 0 -> 1257 bytes .../bin/gui/image/DeleteImage_GUI$3.class | Bin 0 -> 806 bytes .../bin/gui/image/DeleteImage_GUI$4.class | Bin 0 -> 1258 bytes .../bin/gui/image/DeleteImage_GUI$5.class | Bin 0 -> 793 bytes .../bin/gui/image/DeleteImage_GUI$6.class | Bin 0 -> 1346 bytes .../bin/gui/image/DeleteImage_GUI$7.class | Bin 0 -> 832 bytes .../bin/gui/image/DeleteImage_GUI$8.class | Bin 0 -> 851 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 0 -> 11397 bytes .../bin/gui/image/EditImageAllgemein_GUI$1.class | Bin 0 -> 867 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 0 -> 956 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 0 -> 996 bytes .../bin/gui/image/EditImageAllgemein_GUI$4.class | Bin 0 -> 1889 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 0 -> 9112 bytes .../bin/gui/image/EditImageTechnisch_GUI$1.class | Bin 0 -> 746 bytes .../bin/gui/image/EditImageTechnisch_GUI$2.class | Bin 0 -> 835 bytes .../bin/gui/image/EditImageTechnisch_GUI$3.class | Bin 0 -> 1665 bytes .../bin/gui/image/EditImageTechnisch_GUI$4.class | Bin 0 -> 1653 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 0 -> 8443 bytes .../gui/image/EingabeImageAllgemein_GUI$1.class | Bin 0 -> 1015 bytes .../gui/image/EingabeImageAllgemein_GUI$2.class | Bin 0 -> 853 bytes .../gui/image/EingabeImageAllgemein_GUI$3.class | Bin 0 -> 1173 bytes .../gui/image/EingabeImageAllgemein_GUI$4.class | Bin 0 -> 1650 bytes .../bin/gui/image/EingabeImageAllgemein_GUI.class | Bin 0 -> 7809 bytes .../gui/image/EingabeImageTechnisch_GUI$1.class | Bin 0 -> 764 bytes .../gui/image/EingabeImageTechnisch_GUI$2.class | Bin 0 -> 853 bytes .../gui/image/EingabeImageTechnisch_GUI$3.class | Bin 0 -> 1681 bytes .../gui/image/EingabeImageTechnisch_GUI$4.class | Bin 0 -> 1661 bytes .../bin/gui/image/EingabeImageTechnisch_GUI.class | Bin 0 -> 8796 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 0 -> 1391 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 0 -> 1236 bytes .../bin/gui/image/FTPDownloader_GUI$3.class | Bin 0 -> 785 bytes .../bin/gui/image/FTPDownloader_GUI$4.class | Bin 0 -> 1557 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 0 -> 9530 bytes .../bin/gui/image/FTPEditUploader_GUI$1.class | Bin 0 -> 782 bytes .../bin/gui/image/FTPEditUploader_GUI$2.class | Bin 0 -> 1247 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 0 -> 1366 bytes .../bin/gui/image/FTPEditUploader_GUI$4.class | Bin 0 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 0 -> 1503 bytes .../bin/gui/image/FTPEditUploader_GUI$6.class | Bin 0 -> 1641 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 0 -> 10952 bytes .../bin/gui/image/FTPUploader_GUI$1.class | Bin 0 -> 762 bytes .../bin/gui/image/FTPUploader_GUI$2.class | Bin 0 -> 1223 bytes .../bin/gui/image/FTPUploader_GUI$3.class | Bin 0 -> 1594 bytes .../bin/gui/image/FTPUploader_GUI$4.class | Bin 0 -> 1041 bytes .../bin/gui/image/FTPUploader_GUI$5.class | Bin 0 -> 771 bytes .../bin/gui/image/FTPUploader_GUI$6.class | Bin 0 -> 1671 bytes .../bin/gui/image/FTPUploader_GUI$7.class | Bin 0 -> 1616 bytes .../bin/gui/image/FTPUploader_GUI$8.class | Bin 0 -> 856 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI.class | Bin 0 -> 12168 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 0 -> 849 bytes .../bin/gui/image/SearchEditImage_GUI$2.class | Bin 0 -> 1301 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 0 -> 951 bytes .../bin/gui/image/SearchEditImage_GUI$4.class | Bin 0 -> 1298 bytes .../bin/gui/image/SearchEditImage_GUI$5.class | Bin 0 -> 938 bytes .../bin/gui/image/SearchEditImage_GUI$6.class | Bin 0 -> 1771 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 0 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$8.class | Bin 0 -> 980 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 0 -> 2080 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 0 -> 12001 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 0 -> 704 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 0 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 0 -> 806 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 0 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 0 -> 793 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 0 -> 1354 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 0 -> 832 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 0 -> 835 bytes .../bin/gui/image/SearchImage_GUI$9.class | Bin 0 -> 972 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 0 -> 11812 bytes .../bin/gui/intro/BillOfRights_GUI$1.class | Bin 0 -> 710 bytes .../bin/gui/intro/BillOfRights_GUI$2.class | Bin 0 -> 1836 bytes .../bin/gui/intro/BillOfRights_GUI$3.class | Bin 0 -> 959 bytes Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class | Bin 0 -> 10827 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 0 -> 1106 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 0 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$3.class | Bin 0 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 0 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI$5.class | Bin 0 -> 674 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 0 -> 7818 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class | Bin 0 -> 692 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 0 -> 823 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$11.class | Bin 0 -> 1098 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$12.class | Bin 0 -> 1932 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class | Bin 0 -> 771 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class | Bin 0 -> 782 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class | Bin 0 -> 1088 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 0 -> 1006 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class | Bin 0 -> 977 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class | Bin 0 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class | Bin 0 -> 1083 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 0 -> 974 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 0 -> 10983 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class | Bin 0 -> 695 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class | Bin 0 -> 1156 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class | Bin 0 -> 1797 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class | Bin 0 -> 827 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 0 -> 5311 bytes .../gui/lecture/EditLectureAllgemein_GUI$1.class | Bin 0 -> 768 bytes .../gui/lecture/EditLectureAllgemein_GUI$2.class | Bin 0 -> 857 bytes .../gui/lecture/EditLectureAllgemein_GUI$3.class | Bin 0 -> 1892 bytes .../gui/lecture/EditLectureAllgemein_GUI$4.class | Bin 0 -> 1900 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 0 -> 9977 bytes .../bin/gui/lecture/EditLinkLecture_GUI$1.class | Bin 0 -> 738 bytes .../bin/gui/lecture/EditLinkLecture_GUI$2.class | Bin 0 -> 1543 bytes .../bin/gui/lecture/EditLinkLecture_GUI$3.class | Bin 0 -> 840 bytes .../bin/gui/lecture/EditLinkLecture_GUI$4.class | Bin 0 -> 1554 bytes .../bin/gui/lecture/EditLinkLecture_GUI$5.class | Bin 0 -> 827 bytes .../bin/gui/lecture/EditLinkLecture_GUI$6.class | Bin 0 -> 869 bytes .../bin/gui/lecture/EditLinkLecture_GUI$7.class | Bin 0 -> 2478 bytes .../bin/gui/lecture/EditLinkLecture_GUI.class | Bin 0 -> 11459 bytes .../lecture/EingabeLectureAllgemein_GUI$1.class | Bin 0 -> 1041 bytes .../lecture/EingabeLectureAllgemein_GUI$2.class | Bin 0 -> 875 bytes .../lecture/EingabeLectureAllgemein_GUI$3.class | Bin 0 -> 932 bytes .../lecture/EingabeLectureAllgemein_GUI$4.class | Bin 0 -> 929 bytes .../lecture/EingabeLectureAllgemein_GUI$5.class | Bin 0 -> 1929 bytes .../lecture/EingabeLectureAllgemein_GUI$6.class | Bin 0 -> 3057 bytes .../gui/lecture/EingabeLectureAllgemein_GUI.class | Bin 0 -> 10805 bytes .../lecture/ExtendedSearchForImages_GUI$1.class | Bin 0 -> 786 bytes .../lecture/ExtendedSearchForImages_GUI$2.class | Bin 0 -> 939 bytes .../lecture/ExtendedSearchForImages_GUI$3.class | Bin 0 -> 919 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 0 -> 6486 bytes .../bin/gui/lecture/LinkLecture_GUI$1.class | Bin 0 -> 957 bytes .../bin/gui/lecture/LinkLecture_GUI$2.class | Bin 0 -> 1519 bytes .../bin/gui/lecture/LinkLecture_GUI$3.class | Bin 0 -> 816 bytes .../bin/gui/lecture/LinkLecture_GUI$4.class | Bin 0 -> 1530 bytes .../bin/gui/lecture/LinkLecture_GUI$5.class | Bin 0 -> 803 bytes .../bin/gui/lecture/LinkLecture_GUI$6.class | Bin 0 -> 998 bytes .../bin/gui/lecture/LinkLecture_GUI$7.class | Bin 0 -> 3224 bytes .../bin/gui/lecture/LinkLecture_GUI.class | Bin 0 -> 11468 bytes .../bin/gui/lecture/SearchEditLecture_GUI$1.class | Bin 0 -> 871 bytes .../bin/gui/lecture/SearchEditLecture_GUI$2.class | Bin 0 -> 1313 bytes .../bin/gui/lecture/SearchEditLecture_GUI$3.class | Bin 0 -> 973 bytes .../bin/gui/lecture/SearchEditLecture_GUI$4.class | Bin 0 -> 960 bytes .../bin/gui/lecture/SearchEditLecture_GUI$5.class | Bin 0 -> 1783 bytes .../bin/gui/lecture/SearchEditLecture_GUI$6.class | Bin 0 -> 1002 bytes .../bin/gui/lecture/SearchEditLecture_GUI$7.class | Bin 0 -> 3044 bytes .../bin/gui/lecture/SearchEditLecture_GUI.class | Bin 0 -> 11464 bytes .../gui/lecture/SearchMethodLecture_GUI$1.class | Bin 0 -> 762 bytes .../gui/lecture/SearchMethodLecture_GUI$2.class | Bin 0 -> 851 bytes .../gui/lecture/SearchMethodLecture_GUI$3.class | Bin 0 -> 891 bytes .../gui/lecture/SearchMethodLecture_GUI$4.class | Bin 0 -> 1059 bytes .../bin/gui/lecture/SearchMethodLecture_GUI.class | Bin 0 -> 7022 bytes Dozentenmodul/bin/org.eclipse.core.resources.prefs | 2 +- Dozentenmodul/src/GUI/BillOfRights_GUI.java | 192 -------- Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java | 350 -------------- Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java | 366 --------------- .../src/GUI/EingabeImageAllgemein_GUI.java | 302 ------------ .../src/GUI/EingabeImageTechnisch_GUI.java | 364 --------------- .../src/GUI/EingabeVeranstaltungAllgemein_GUI.java | 504 -------------------- Dozentenmodul/src/GUI/ExtendedSearch_GUI.java | 234 ---------- Dozentenmodul/src/GUI/FTPDownloader_GUI.java | 370 --------------- Dozentenmodul/src/GUI/FTPUploader_GUI.java | 512 -------------------- Dozentenmodul/src/GUI/LinkImage_GUI.java | 471 ------------------- Dozentenmodul/src/GUI/Login_GUI.java | 260 ----------- Dozentenmodul/src/GUI/MainMenue_GUI.java | 443 ------------------ Dozentenmodul/src/GUI/SearchImage_GUI.java | 459 ------------------ Dozentenmodul/src/GUI/SearchMethod_GUI.java | 243 ---------- Dozentenmodul/src/GUI/VmWareLink_GUI.java | 215 --------- Dozentenmodul/src/ftp/DownloadTask.java | 2 +- Dozentenmodul/src/gui/BillOfRights_GUI.java | 192 -------- Dozentenmodul/src/gui/DeleteImage_GUI.java | 439 ------------------ Dozentenmodul/src/gui/EditImageAllgemein_GUI.java | 350 -------------- Dozentenmodul/src/gui/EditImageTechnisch_GUI.java | 366 --------------- Dozentenmodul/src/gui/EditLinkImage_GUI.java | 436 ----------------- .../src/gui/EditVeranstaltungAllgemein_GUI.java | 411 ---------------- .../src/gui/EingabeImageAllgemein_GUI.java | 302 ------------ .../src/gui/EingabeImageTechnisch_GUI.java | 364 --------------- .../src/gui/EingabeVeranstaltungAllgemein_GUI.java | 504 -------------------- Dozentenmodul/src/gui/ExtendedSearch_GUI.java | 234 ---------- Dozentenmodul/src/gui/FTPDownloader_GUI.java | 370 --------------- Dozentenmodul/src/gui/FTPEditUploader_GUI.java | 427 ----------------- Dozentenmodul/src/gui/FTPUploader_GUI.java | 482 ------------------- Dozentenmodul/src/gui/LinkImage_GUI.java | 471 ------------------- Dozentenmodul/src/gui/Login_GUI.java | 260 ----------- Dozentenmodul/src/gui/MainMenue_GUI.java | 443 ------------------ Dozentenmodul/src/gui/SearchEditImage_GUI.java | 495 -------------------- Dozentenmodul/src/gui/SearchEditLecture_GUI.java | 448 ------------------ Dozentenmodul/src/gui/SearchImage_GUI.java | 459 ------------------ Dozentenmodul/src/gui/SearchMethod_GUI.java | 243 ---------- Dozentenmodul/src/gui/VmWareLink_GUI.java | 215 --------- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 442 ++++++++++++++++++ .../src/gui/image/EditImageAllgemein_GUI.java | 347 ++++++++++++++ .../src/gui/image/EditImageTechnisch_GUI.java | 359 ++++++++++++++ .../src/gui/image/EingabeImageAllgemein_GUI.java | 304 ++++++++++++ .../src/gui/image/EingabeImageTechnisch_GUI.java | 366 +++++++++++++++ Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 370 +++++++++++++++ .../src/gui/image/FTPEditUploader_GUI.java | 428 +++++++++++++++++ Dozentenmodul/src/gui/image/FTPUploader_GUI.java | 483 +++++++++++++++++++ .../src/gui/image/SearchEditImage_GUI.java | 514 +++++++++++++++++++++ Dozentenmodul/src/gui/image/SearchImage_GUI.java | 459 ++++++++++++++++++ Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 193 ++++++++ Dozentenmodul/src/gui/intro/Login_GUI.java | 252 ++++++++++ Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 450 ++++++++++++++++++ Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 216 +++++++++ .../src/gui/lecture/EditLectureAllgemein_GUI.java | 413 +++++++++++++++++ .../src/gui/lecture/EditLinkLecture_GUI.java | 438 ++++++++++++++++++ .../gui/lecture/EingabeLectureAllgemein_GUI.java | 506 ++++++++++++++++++++ .../gui/lecture/ExtendedSearchForImages_GUI.java | 237 ++++++++++ Dozentenmodul/src/gui/lecture/LinkLecture_GUI.java | 473 +++++++++++++++++++ .../src/gui/lecture/SearchEditLecture_GUI.java | 451 ++++++++++++++++++ .../src/gui/lecture/SearchMethodLecture_GUI.java | 246 ++++++++++ 416 files changed, 7950 insertions(+), 13199 deletions(-) delete mode 100644 Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/BillOfRights_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/FTPDownloader_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class delete mode 100644 Dozentenmodul/bin/GUI/FTPUploader_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/GUI/LinkImage_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/Login_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/Login_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/Login_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/Login_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/MainMenue_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/MainMenue_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/MainMenue_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/MainMenue_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/MainMenue_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/SearchImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/SearchImage_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class delete mode 100644 Dozentenmodul/bin/GUI/SearchMethod_GUI.class delete mode 100644 Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class delete mode 100644 Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class delete mode 100644 Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class delete mode 100644 Dozentenmodul/bin/GUI/VmWareLink_GUI.class delete mode 100644 Dozentenmodul/bin/gui/BillOfRights_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/BillOfRights_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/BillOfRights_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/BillOfRights_GUI.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$8.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class delete mode 100644 Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/ExtendedSearch_GUI.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/FTPEditUploader_GUI.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI$8.class delete mode 100644 Dozentenmodul/bin/gui/FTPUploader_GUI.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/LinkImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/Login_GUI.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$10.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$11.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$12.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$8.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI$9.class delete mode 100644 Dozentenmodul/bin/gui/MainMenue_GUI.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$6.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$7.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$8.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI$9.class delete mode 100644 Dozentenmodul/bin/gui/SearchImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/SearchMethod_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/SearchMethod_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/SearchMethod_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/SearchMethod_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/SearchMethod_GUI.class delete mode 100644 Dozentenmodul/bin/gui/VmWareLink_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/VmWareLink_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/VmWareLink_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/VmWareLink_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/VmWareLink_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/image/DeleteImage_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class create mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class create mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI.class create mode 100644 Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$11.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$12.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class create mode 100644 Dozentenmodul/bin/gui/intro/MainMenue_GUI.class create mode 100644 Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/lecture/LinkLecture_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class delete mode 100644 Dozentenmodul/src/GUI/BillOfRights_GUI.java delete mode 100644 Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java delete mode 100644 Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java delete mode 100644 Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/GUI/ExtendedSearch_GUI.java delete mode 100644 Dozentenmodul/src/GUI/FTPDownloader_GUI.java delete mode 100644 Dozentenmodul/src/GUI/FTPUploader_GUI.java delete mode 100644 Dozentenmodul/src/GUI/LinkImage_GUI.java delete mode 100644 Dozentenmodul/src/GUI/Login_GUI.java delete mode 100644 Dozentenmodul/src/GUI/MainMenue_GUI.java delete mode 100644 Dozentenmodul/src/GUI/SearchImage_GUI.java delete mode 100644 Dozentenmodul/src/GUI/SearchMethod_GUI.java delete mode 100644 Dozentenmodul/src/GUI/VmWareLink_GUI.java delete mode 100644 Dozentenmodul/src/gui/BillOfRights_GUI.java delete mode 100644 Dozentenmodul/src/gui/DeleteImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/EditImageAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/gui/EditImageTechnisch_GUI.java delete mode 100644 Dozentenmodul/src/gui/EditLinkImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java delete mode 100644 Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java delete mode 100644 Dozentenmodul/src/gui/ExtendedSearch_GUI.java delete mode 100644 Dozentenmodul/src/gui/FTPDownloader_GUI.java delete mode 100644 Dozentenmodul/src/gui/FTPEditUploader_GUI.java delete mode 100644 Dozentenmodul/src/gui/FTPUploader_GUI.java delete mode 100644 Dozentenmodul/src/gui/LinkImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/Login_GUI.java delete mode 100644 Dozentenmodul/src/gui/MainMenue_GUI.java delete mode 100644 Dozentenmodul/src/gui/SearchEditImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/SearchEditLecture_GUI.java delete mode 100644 Dozentenmodul/src/gui/SearchImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/SearchMethod_GUI.java delete mode 100644 Dozentenmodul/src/gui/VmWareLink_GUI.java create mode 100644 Dozentenmodul/src/gui/image/DeleteImage_GUI.java create mode 100644 Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java create mode 100644 Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java create mode 100644 Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java create mode 100644 Dozentenmodul/src/gui/image/EingabeImageTechnisch_GUI.java create mode 100644 Dozentenmodul/src/gui/image/FTPDownloader_GUI.java create mode 100644 Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java create mode 100644 Dozentenmodul/src/gui/image/FTPUploader_GUI.java create mode 100644 Dozentenmodul/src/gui/image/SearchEditImage_GUI.java create mode 100644 Dozentenmodul/src/gui/image/SearchImage_GUI.java create mode 100644 Dozentenmodul/src/gui/intro/BillOfRights_GUI.java create mode 100644 Dozentenmodul/src/gui/intro/Login_GUI.java create mode 100644 Dozentenmodul/src/gui/intro/MainMenue_GUI.java create mode 100644 Dozentenmodul/src/gui/intro/VmWareLink_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/EditLinkLecture_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/EingabeLectureAllgemein_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/LinkLecture_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/SearchEditLecture_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java (limited to 'Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class') diff --git a/Dozentenmodul/.settings/org.eclipse.core.resources.prefs b/Dozentenmodul/.settings/org.eclipse.core.resources.prefs index 49b9df2a..61583c81 100644 --- a/Dozentenmodul/.settings/org.eclipse.core.resources.prefs +++ b/Dozentenmodul/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -encoding//src/gui/EditVeranstaltungAllgemein_GUI.java=UTF-8 +encoding//src/gui/lecture/EditLectureAllgemein_GUI.java=UTF-8 diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class deleted file mode 100644 index 5574d48e..00000000 Binary files a/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class deleted file mode 100644 index 49256cbe..00000000 Binary files a/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class deleted file mode 100644 index a2ae1bca..00000000 Binary files a/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI.class deleted file mode 100644 index 097d3995..00000000 Binary files a/Dozentenmodul/bin/GUI/BillOfRights_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class deleted file mode 100644 index 062a5aeb..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class deleted file mode 100644 index 9d0a3bea..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class deleted file mode 100644 index 69507f5e..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class deleted file mode 100644 index e7af4c13..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class deleted file mode 100644 index 2287ca1a..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class deleted file mode 100644 index 3ed6a8ca..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class deleted file mode 100644 index c334f61e..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class deleted file mode 100644 index 0c45cb47..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class deleted file mode 100644 index 6b0b0760..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class deleted file mode 100644 index 182e34ea..00000000 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class deleted file mode 100644 index d6ce35c1..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class deleted file mode 100644 index 979638d5..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class deleted file mode 100644 index a8301134..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class deleted file mode 100644 index fb0a74b7..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class deleted file mode 100644 index af7cda76..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class deleted file mode 100644 index b7b5fc47..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class deleted file mode 100644 index 9e20b5fa..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class deleted file mode 100644 index 54767b1b..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class deleted file mode 100644 index 284319c7..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class deleted file mode 100644 index 2a2a0020..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class deleted file mode 100644 index 351eac91..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class deleted file mode 100644 index 26a0b9ad..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class deleted file mode 100644 index 99c0174e..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class deleted file mode 100644 index 54053623..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class deleted file mode 100644 index 1614b33b..00000000 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class deleted file mode 100644 index 567cb8a9..00000000 Binary files a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class deleted file mode 100644 index 3067718e..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class deleted file mode 100644 index 41ad1e3f..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class deleted file mode 100644 index 2af3aa99..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class deleted file mode 100644 index 6f093d26..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class deleted file mode 100644 index 0d64e048..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class deleted file mode 100644 index 7586f5de..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class deleted file mode 100644 index 245043a2..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class deleted file mode 100644 index 2422f25a..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class deleted file mode 100644 index 551a9ab9..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class deleted file mode 100644 index 9f214076..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class deleted file mode 100644 index 88b2815c..00000000 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class deleted file mode 100644 index 592ffc31..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class deleted file mode 100644 index 05132e61..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class deleted file mode 100644 index 6872589c..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class deleted file mode 100644 index d56819a3..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class deleted file mode 100644 index d4ea86c6..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class deleted file mode 100644 index f1cd179d..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class deleted file mode 100644 index 40df5002..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI.class b/Dozentenmodul/bin/GUI/LinkImage_GUI.class deleted file mode 100644 index d9cfd2ea..00000000 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class deleted file mode 100644 index b4388d57..00000000 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class deleted file mode 100644 index 54cd4d69..00000000 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class deleted file mode 100644 index 46796de6..00000000 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI.class b/Dozentenmodul/bin/GUI/Login_GUI.class deleted file mode 100644 index da10a7ca..00000000 Binary files a/Dozentenmodul/bin/GUI/Login_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class deleted file mode 100644 index 57b08981..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class deleted file mode 100644 index 77e0fbd6..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class deleted file mode 100644 index 6e35da4f..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class deleted file mode 100644 index 995f1202..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class deleted file mode 100644 index c6188012..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class deleted file mode 100644 index 3839b528..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class deleted file mode 100644 index d014f8d0..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class deleted file mode 100644 index b2222872..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class deleted file mode 100644 index 296d7ebc..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class deleted file mode 100644 index 4b572444..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class deleted file mode 100644 index 64fdeb32..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI.class deleted file mode 100644 index d4f71a85..00000000 Binary files a/Dozentenmodul/bin/GUI/SearchMethod_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class deleted file mode 100644 index 65a75adf..00000000 Binary files a/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class deleted file mode 100644 index 1c73d190..00000000 Binary files a/Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class deleted file mode 100644 index ba568bd7..00000000 Binary files a/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI.class deleted file mode 100644 index 4431fe00..00000000 Binary files a/Dozentenmodul/bin/GUI/VmWareLink_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/ftp/DownloadTask.class b/Dozentenmodul/bin/ftp/DownloadTask.class index 1b153fb7..447a8eb4 100644 Binary files a/Dozentenmodul/bin/ftp/DownloadTask.class and b/Dozentenmodul/bin/ftp/DownloadTask.class differ diff --git a/Dozentenmodul/bin/gui/BillOfRights_GUI$1.class b/Dozentenmodul/bin/gui/BillOfRights_GUI$1.class deleted file mode 100644 index 5574d48e..00000000 Binary files a/Dozentenmodul/bin/gui/BillOfRights_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/BillOfRights_GUI$2.class deleted file mode 100644 index 49256cbe..00000000 Binary files a/Dozentenmodul/bin/gui/BillOfRights_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/BillOfRights_GUI$3.class deleted file mode 100644 index a2ae1bca..00000000 Binary files a/Dozentenmodul/bin/gui/BillOfRights_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/BillOfRights_GUI.class deleted file mode 100644 index 097d3995..00000000 Binary files a/Dozentenmodul/bin/gui/BillOfRights_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class deleted file mode 100644 index 6139b7dc..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class deleted file mode 100644 index 214998fb..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class deleted file mode 100644 index 1ab047a4..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class deleted file mode 100644 index 9382863b..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class deleted file mode 100644 index 0e845cc7..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class deleted file mode 100644 index 63b957b6..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class deleted file mode 100644 index b2bd5495..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class deleted file mode 100644 index a1eb0a54..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/DeleteImage_GUI.class deleted file mode 100644 index ad9c8803..00000000 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class deleted file mode 100644 index 062a5aeb..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class deleted file mode 100644 index 9d0a3bea..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class deleted file mode 100644 index 69507f5e..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class deleted file mode 100644 index e7af4c13..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class deleted file mode 100644 index 2287ca1a..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class deleted file mode 100644 index 3ed6a8ca..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class deleted file mode 100644 index c334f61e..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class deleted file mode 100644 index 0c45cb47..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class deleted file mode 100644 index 6b0b0760..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class deleted file mode 100644 index 182e34ea..00000000 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class deleted file mode 100644 index 678491af..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class deleted file mode 100644 index 6384d363..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class deleted file mode 100644 index e94e0e13..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class deleted file mode 100644 index b952d8f3..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class deleted file mode 100644 index 434f209e..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class deleted file mode 100644 index a38e792e..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class deleted file mode 100644 index 07d40c7e..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI.class deleted file mode 100644 index 218bfa86..00000000 Binary files a/Dozentenmodul/bin/gui/EditLinkImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class deleted file mode 100644 index 43873477..00000000 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class deleted file mode 100644 index 98d359ee..00000000 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class deleted file mode 100644 index ac902be7..00000000 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class deleted file mode 100644 index b786208b..00000000 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class deleted file mode 100644 index 1c9bf34c..00000000 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class deleted file mode 100644 index d6ce35c1..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class deleted file mode 100644 index 979638d5..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class deleted file mode 100644 index a8301134..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class deleted file mode 100644 index fb0a74b7..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class deleted file mode 100644 index af7cda76..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$1.class deleted file mode 100644 index b7b5fc47..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class deleted file mode 100644 index 9e20b5fa..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class deleted file mode 100644 index 54767b1b..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class deleted file mode 100644 index 284319c7..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class deleted file mode 100644 index 2a2a0020..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class deleted file mode 100644 index 351eac91..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class deleted file mode 100644 index 26a0b9ad..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class deleted file mode 100644 index 99c0174e..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class deleted file mode 100644 index 54053623..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class deleted file mode 100644 index 6f6df5ca..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class deleted file mode 100644 index 9eaac71c..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class deleted file mode 100644 index 1614b33b..00000000 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class deleted file mode 100644 index 35128bac..00000000 Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class deleted file mode 100644 index d1fc8d5b..00000000 Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class deleted file mode 100644 index 86321ae8..00000000 Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class b/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class deleted file mode 100644 index 567cb8a9..00000000 Binary files a/Dozentenmodul/bin/gui/ExtendedSearch_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class deleted file mode 100644 index 3067718e..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class deleted file mode 100644 index 41ad1e3f..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class deleted file mode 100644 index 2af3aa99..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class deleted file mode 100644 index 6f093d26..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class deleted file mode 100644 index 0d64e048..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class deleted file mode 100644 index 3f952241..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class deleted file mode 100644 index 0bff908a..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class deleted file mode 100644 index 7bafe65d..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class deleted file mode 100644 index a0883626..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class deleted file mode 100644 index 034411c3..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class deleted file mode 100644 index 043a33a4..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class deleted file mode 100644 index a3da591f..00000000 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class deleted file mode 100644 index 7586f5de..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class deleted file mode 100644 index 245043a2..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class deleted file mode 100644 index 2422f25a..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class deleted file mode 100644 index 551a9ab9..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class deleted file mode 100644 index 9f214076..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class deleted file mode 100644 index a7c0b511..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class deleted file mode 100644 index 10890564..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class deleted file mode 100644 index 07752dad..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class deleted file mode 100644 index 88b2815c..00000000 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$1.class b/Dozentenmodul/bin/gui/LinkImage_GUI$1.class deleted file mode 100644 index 592ffc31..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$2.class b/Dozentenmodul/bin/gui/LinkImage_GUI$2.class deleted file mode 100644 index 05132e61..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$3.class b/Dozentenmodul/bin/gui/LinkImage_GUI$3.class deleted file mode 100644 index 6872589c..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$4.class b/Dozentenmodul/bin/gui/LinkImage_GUI$4.class deleted file mode 100644 index d56819a3..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$5.class b/Dozentenmodul/bin/gui/LinkImage_GUI$5.class deleted file mode 100644 index d4ea86c6..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$6.class b/Dozentenmodul/bin/gui/LinkImage_GUI$6.class deleted file mode 100644 index f1cd179d..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class deleted file mode 100644 index 40df5002..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI.class b/Dozentenmodul/bin/gui/LinkImage_GUI.class deleted file mode 100644 index d9cfd2ea..00000000 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class deleted file mode 100644 index b4388d57..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class deleted file mode 100644 index 54cd4d69..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class deleted file mode 100644 index 46796de6..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class deleted file mode 100644 index 22908f76..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class deleted file mode 100644 index e1bf5be2..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class deleted file mode 100644 index da10a7ca..00000000 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class deleted file mode 100644 index ae9c04f3..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/MainMenue_GUI$10.class deleted file mode 100644 index 12eefe5e..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$10.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class b/Dozentenmodul/bin/gui/MainMenue_GUI$11.class deleted file mode 100644 index 16af50d0..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$11.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class b/Dozentenmodul/bin/gui/MainMenue_GUI$12.class deleted file mode 100644 index fab4ce2b..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$12.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class deleted file mode 100644 index a19fcb59..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class deleted file mode 100644 index 9ae0a452..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class deleted file mode 100644 index 995f1202..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/MainMenue_GUI$5.class deleted file mode 100644 index 0317cac0..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/MainMenue_GUI$6.class deleted file mode 100644 index 416d44d4..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/MainMenue_GUI$7.class deleted file mode 100644 index c991ffd3..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/MainMenue_GUI$8.class deleted file mode 100644 index ef110e30..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/MainMenue_GUI$9.class deleted file mode 100644 index a81507c6..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI$9.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class deleted file mode 100644 index c6188012..00000000 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class deleted file mode 100644 index 4c8a49ba..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class deleted file mode 100644 index 0bb68dce..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class deleted file mode 100644 index 414b3a0c..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class deleted file mode 100644 index 8ec22cf9..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class deleted file mode 100644 index 1758ada3..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class deleted file mode 100644 index b89857f4..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class deleted file mode 100644 index ca1774f7..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class deleted file mode 100644 index 08d744bd..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class deleted file mode 100644 index 00e112de..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class deleted file mode 100644 index c562cc42..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class deleted file mode 100644 index 24e378be..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class deleted file mode 100644 index 1b56fca6..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class deleted file mode 100644 index b48d68c6..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class deleted file mode 100644 index e37e9a30..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class deleted file mode 100644 index d8cad4d1..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class deleted file mode 100644 index fe6a0214..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class deleted file mode 100644 index 64b0b1ae..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class deleted file mode 100644 index ed3f1c5b..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchImage_GUI$1.class deleted file mode 100644 index 3839b528..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchImage_GUI$2.class deleted file mode 100644 index 9b8efb38..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchImage_GUI$3.class deleted file mode 100644 index 6317e30c..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchImage_GUI$4.class deleted file mode 100644 index 8b38dc60..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchImage_GUI$5.class deleted file mode 100644 index a238b34c..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchImage_GUI$6.class deleted file mode 100644 index ae62d5aa..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class deleted file mode 100644 index 3a1e2f3a..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchImage_GUI$8.class deleted file mode 100644 index e5e281b0..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class deleted file mode 100644 index 679115d8..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI.class b/Dozentenmodul/bin/gui/SearchImage_GUI.class deleted file mode 100644 index d014f8d0..00000000 Binary files a/Dozentenmodul/bin/gui/SearchImage_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchMethod_GUI$1.class b/Dozentenmodul/bin/gui/SearchMethod_GUI$1.class deleted file mode 100644 index b2222872..00000000 Binary files a/Dozentenmodul/bin/gui/SearchMethod_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchMethod_GUI$2.class b/Dozentenmodul/bin/gui/SearchMethod_GUI$2.class deleted file mode 100644 index 296d7ebc..00000000 Binary files a/Dozentenmodul/bin/gui/SearchMethod_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchMethod_GUI$3.class b/Dozentenmodul/bin/gui/SearchMethod_GUI$3.class deleted file mode 100644 index 4b572444..00000000 Binary files a/Dozentenmodul/bin/gui/SearchMethod_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchMethod_GUI$4.class b/Dozentenmodul/bin/gui/SearchMethod_GUI$4.class deleted file mode 100644 index 64fdeb32..00000000 Binary files a/Dozentenmodul/bin/gui/SearchMethod_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchMethod_GUI.class b/Dozentenmodul/bin/gui/SearchMethod_GUI.class deleted file mode 100644 index d4f71a85..00000000 Binary files a/Dozentenmodul/bin/gui/SearchMethod_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/VmWareLink_GUI$1.class deleted file mode 100644 index 65a75adf..00000000 Binary files a/Dozentenmodul/bin/gui/VmWareLink_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/VmWareLink_GUI$2.class deleted file mode 100644 index 1c73d190..00000000 Binary files a/Dozentenmodul/bin/gui/VmWareLink_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/VmWareLink_GUI$3.class deleted file mode 100644 index ba568bd7..00000000 Binary files a/Dozentenmodul/bin/gui/VmWareLink_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/VmWareLink_GUI$4.class deleted file mode 100644 index b30fc786..00000000 Binary files a/Dozentenmodul/bin/gui/VmWareLink_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/VmWareLink_GUI.class deleted file mode 100644 index 4431fe00..00000000 Binary files a/Dozentenmodul/bin/gui/VmWareLink_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class new file mode 100644 index 00000000..679fea24 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class new file mode 100644 index 00000000..2d8d670d Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class new file mode 100644 index 00000000..a9efff64 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class new file mode 100644 index 00000000..c3c7d0d4 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class new file mode 100644 index 00000000..d46ad562 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class new file mode 100644 index 00000000..f2192686 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class new file mode 100644 index 00000000..10b584a7 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class new file mode 100644 index 00000000..cb8ea27e Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class new file mode 100644 index 00000000..4549e05a Binary files /dev/null and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class new file mode 100644 index 00000000..7692bcfb Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class new file mode 100644 index 00000000..d11a8449 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class new file mode 100644 index 00000000..8468f633 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class new file mode 100644 index 00000000..d87f50a2 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class new file mode 100644 index 00000000..b7fda6b3 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class new file mode 100644 index 00000000..b6e700d1 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class new file mode 100644 index 00000000..00451da1 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class new file mode 100644 index 00000000..5d742182 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class new file mode 100644 index 00000000..ccf62925 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class new file mode 100644 index 00000000..84957fcf Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$1.class new file mode 100644 index 00000000..13b87fc2 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$2.class new file mode 100644 index 00000000..5fd0f465 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$3.class new file mode 100644 index 00000000..6a3ce5c1 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class new file mode 100644 index 00000000..0ccaaa47 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI.class new file mode 100644 index 00000000..fffd657d Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$1.class new file mode 100644 index 00000000..129b6cdc Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$2.class new file mode 100644 index 00000000..806acf77 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$3.class new file mode 100644 index 00000000..154292c3 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$4.class new file mode 100644 index 00000000..a7088c4b Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI.class new file mode 100644 index 00000000..39e53c25 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/EingabeImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class new file mode 100644 index 00000000..90a9b390 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class new file mode 100644 index 00000000..ae1b44e0 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class new file mode 100644 index 00000000..3b6b83fb Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class new file mode 100644 index 00000000..8401b2ec Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class new file mode 100644 index 00000000..60383d7e Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class new file mode 100644 index 00000000..a4ac78a8 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class new file mode 100644 index 00000000..99826f3b Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class new file mode 100644 index 00000000..9732d4d5 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class new file mode 100644 index 00000000..b8da1599 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class new file mode 100644 index 00000000..b899f1f9 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class new file mode 100644 index 00000000..9b72b607 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class new file mode 100644 index 00000000..f6b45f3a Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$1.class new file mode 100644 index 00000000..8459bd28 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class new file mode 100644 index 00000000..b2455840 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class new file mode 100644 index 00000000..924e0a89 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class new file mode 100644 index 00000000..2be81e8d Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class new file mode 100644 index 00000000..c09c2054 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class new file mode 100644 index 00000000..6a509054 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class new file mode 100644 index 00000000..d7cb923d Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class new file mode 100644 index 00000000..f6faec31 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class new file mode 100644 index 00000000..06003d58 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class new file mode 100644 index 00000000..ed060fc5 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class new file mode 100644 index 00000000..ff02ba32 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class new file mode 100644 index 00000000..5b3e93a0 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class new file mode 100644 index 00000000..e0ebd234 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class new file mode 100644 index 00000000..f0cfc5da Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class new file mode 100644 index 00000000..b6600cc8 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class new file mode 100644 index 00000000..772ed400 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class new file mode 100644 index 00000000..ffde361f Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class new file mode 100644 index 00000000..345a0f36 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class new file mode 100644 index 00000000..b804db88 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class new file mode 100644 index 00000000..8dbd7362 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class new file mode 100644 index 00000000..7c32f943 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class new file mode 100644 index 00000000..5b8f3f8b Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class new file mode 100644 index 00000000..f842a022 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class new file mode 100644 index 00000000..2452046f Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class new file mode 100644 index 00000000..eff43b91 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class new file mode 100644 index 00000000..8b9f3286 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class new file mode 100644 index 00000000..a5ff7a18 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class new file mode 100644 index 00000000..e5ad916e Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class new file mode 100644 index 00000000..fdefc8b5 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class new file mode 100644 index 00000000..6a2f53f1 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class new file mode 100644 index 00000000..16bbf49f Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class new file mode 100644 index 00000000..a3ae5059 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class new file mode 100644 index 00000000..9d951522 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class new file mode 100644 index 00000000..a5df5dde Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class new file mode 100644 index 00000000..e012848d Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$3.class b/Dozentenmodul/bin/gui/intro/Login_GUI$3.class new file mode 100644 index 00000000..110634ac Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class new file mode 100644 index 00000000..6a5edcf2 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$5.class b/Dozentenmodul/bin/gui/intro/Login_GUI$5.class new file mode 100644 index 00000000..95da5c83 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class new file mode 100644 index 00000000..8da7aa27 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class new file mode 100644 index 00000000..ab46596e Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class new file mode 100644 index 00000000..6e02e951 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$11.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$11.class new file mode 100644 index 00000000..6f117bda Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$11.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$12.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$12.class new file mode 100644 index 00000000..9833fb28 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$12.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class new file mode 100644 index 00000000..89c32672 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class new file mode 100644 index 00000000..f2be5a62 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class new file mode 100644 index 00000000..89669271 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class new file mode 100644 index 00000000..ac611e57 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class new file mode 100644 index 00000000..40333b3d Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class new file mode 100644 index 00000000..0ce905d2 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class new file mode 100644 index 00000000..dfe0fd6d Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class new file mode 100644 index 00000000..ffa1370e Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class new file mode 100644 index 00000000..1c2b587b Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class new file mode 100644 index 00000000..60fcb543 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class new file mode 100644 index 00000000..a61250c1 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class new file mode 100644 index 00000000..bfa90045 Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class new file mode 100644 index 00000000..056f8f8d Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class new file mode 100644 index 00000000..e74b203f Binary files /dev/null and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class new file mode 100644 index 00000000..dd70f264 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class new file mode 100644 index 00000000..22209c73 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class new file mode 100644 index 00000000..808b6d99 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class new file mode 100644 index 00000000..fd1db594 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class new file mode 100644 index 00000000..05c6ac16 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$1.class new file mode 100644 index 00000000..47c63d0c Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$2.class new file mode 100644 index 00000000..892b1146 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$3.class new file mode 100644 index 00000000..90035c9c Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$4.class new file mode 100644 index 00000000..5f75304e Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$5.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$5.class new file mode 100644 index 00000000..cffdc75a Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$6.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$6.class new file mode 100644 index 00000000..50c6fd03 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$7.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$7.class new file mode 100644 index 00000000..d75be1b5 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI.class new file mode 100644 index 00000000..52d083e0 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EditLinkLecture_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$1.class new file mode 100644 index 00000000..efca8a22 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$2.class new file mode 100644 index 00000000..c7ac4cbd Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$3.class new file mode 100644 index 00000000..7d2bf4b7 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$4.class new file mode 100644 index 00000000..64422578 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$5.class new file mode 100644 index 00000000..6faabeed Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$6.class new file mode 100644 index 00000000..ceeea067 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI.class new file mode 100644 index 00000000..573cd051 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/EingabeLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class new file mode 100644 index 00000000..8ae5f63c Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class new file mode 100644 index 00000000..c67eb15c Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class new file mode 100644 index 00000000..9392da27 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class new file mode 100644 index 00000000..665f51d1 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$1.class new file mode 100644 index 00000000..20320054 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$2.class new file mode 100644 index 00000000..5648a1e6 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$3.class new file mode 100644 index 00000000..bc0e3d3e Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$4.class new file mode 100644 index 00000000..51852440 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$5.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$5.class new file mode 100644 index 00000000..bb626fb9 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$6.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$6.class new file mode 100644 index 00000000..b08d2945 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$7.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$7.class new file mode 100644 index 00000000..659fea33 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI.class new file mode 100644 index 00000000..d5aedb77 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/LinkLecture_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$1.class new file mode 100644 index 00000000..e13684eb Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$2.class new file mode 100644 index 00000000..ab0ca727 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$3.class new file mode 100644 index 00000000..9be48f4a Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$4.class new file mode 100644 index 00000000..089015f7 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$5.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$5.class new file mode 100644 index 00000000..12d258fb Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$6.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$6.class new file mode 100644 index 00000000..e3015c86 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$7.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$7.class new file mode 100644 index 00000000..d306ed22 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI.class new file mode 100644 index 00000000..87d19a51 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchEditLecture_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class new file mode 100644 index 00000000..b8590387 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class new file mode 100644 index 00000000..975fb7c1 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class new file mode 100644 index 00000000..9d4fc780 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class new file mode 100644 index 00000000..46f15114 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class new file mode 100644 index 00000000..92a6a519 Binary files /dev/null and b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class differ diff --git a/Dozentenmodul/bin/org.eclipse.core.resources.prefs b/Dozentenmodul/bin/org.eclipse.core.resources.prefs index 49b9df2a..61583c81 100644 --- a/Dozentenmodul/bin/org.eclipse.core.resources.prefs +++ b/Dozentenmodul/bin/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -encoding//src/gui/EditVeranstaltungAllgemein_GUI.java=UTF-8 +encoding//src/gui/lecture/EditLectureAllgemein_GUI.java=UTF-8 diff --git a/Dozentenmodul/src/GUI/BillOfRights_GUI.java b/Dozentenmodul/src/GUI/BillOfRights_GUI.java deleted file mode 100644 index a18ce291..00000000 --- a/Dozentenmodul/src/GUI/BillOfRights_GUI.java +++ /dev/null @@ -1,192 +0,0 @@ -package gui; - -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.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -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.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - - - -@SuppressWarnings("serial") -public class BillOfRights_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JButton fwdButton; - JCheckBox chckbxAkzeptieren; - - /** - * Create the dialog. - */ - public BillOfRights_GUI() { - setResizable(false); - - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet das Programm beim Klick auf das X - System.exit(0); - } - }); - try { - //Setzt das Look & Feel auf das 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*"); - - //Zentiert das Fenster in der Bildschirmmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 567, 60); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hinweis"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); - } - - JTextPane txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 95, 567, 485); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JTextArea txtrLoremIpsumDolor = new JTextArea(); - txtrLoremIpsumDolor.setWrapStyleWord(true); - txtrLoremIpsumDolor.setLineWrap(true); - txtrLoremIpsumDolor.setEditable(false); - JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor); - scr.setBounds(0, 0, 567, 477); - txtrLoremIpsumDolor.setBounds(0, 0, 567, 477); - txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo"); - - contentPanel.add(scr); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - fwdButton = new JButton("Weiter"); - fwdButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - ini.put("main", "BillOfRights",true); - ini.store(); - } catch (InvalidFileFormatException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - VmWareLink_GUI ac=new VmWareLink_GUI(); - ac.setVisible(true); - dispose(); - } - }); - fwdButton.setEnabled(false); - - buttonPane.add(fwdButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 82, 587, 2); - getContentPane().add(separator); - } - - chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen."); - chckbxAkzeptieren.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - //Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht - if(chckbxAkzeptieren.isSelected()==true) - { - - fwdButton.setEnabled(true); - - } - else - { - - } - } - }); - chckbxAkzeptieren.setBackground(SystemColor.menu); - chckbxAkzeptieren.setBounds(10, 587, 567, 23); - getContentPane().add(chckbxAkzeptieren); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER); - 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/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java deleted file mode 100644 index 1d30e9d0..00000000 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ /dev/null @@ -1,350 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Map; - -import javax.swing.JButton; -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.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -import org.apache.thrift.TException; - -import models.Image; -import models.person; -import server.Server.Client; -import thrift.ThriftConnection; -//import org.eclipse.wb.swing.FocusTraversalOnArray; -import java.awt.Component; - -@SuppressWarnings("serial") -public class EditImageAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField imagename; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - private JPanel panel_2; - private JLabel lblNewLabel; - private JTextPane txtpnBitteWhlenSie; - private JPanel buttonPane; - private JButton backButton; - private JButton okButton; - - /** - * Create the dialog. - */ - public EditImageAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei einem Klick auf das X - con.closeThriftConnection(); - System.exit(0); - } - }); - //Verhindert das vergrößern des Fensters - setResizable(false); - - try { - 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 der Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - initData(); - getContentPane().setLayout(null); - { - panel_2 = new JPanel(); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 11, 577, 57); - getContentPane().add(panel_2); - panel_2.setLayout(null); - { - lblNewLabel = new JLabel("Bearbeiten Ihrer Daten"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel_2.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); - } - - txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel_2.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 369); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 245, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEditable(false); - Vorname.setEnabled(false); - Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setColumns(10); - Vorname.setBounds(145, 245, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 276, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setColumns(10); - Nachname.setBounds(145, 276, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 307, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 307, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 338, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setBackground(Color.WHITE); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setColumns(10); - EMail.setBounds(145, 338, 350, 20); - panel_1.add(EMail); - - JLabel lblImagename = new JLabel("Imagename: *"); - lblImagename.setBackground(SystemColor.menu); - lblImagename.setBounds(10, 31, 125, 20); - panel_1.add(lblImagename); - - imagename = new JTextField(); - imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); - imagename.setBackground(Color.WHITE); - imagename.setText(Image.image.getImagename()); - imagename.setColumns(10); - imagename.setBounds(145, 31, 350, 20); - panel_1.add(imagename); - - JTextArea txtrGebenSieBitte = new JTextArea(); - txtrGebenSieBitte.setBackground(SystemColor.menu); - txtrGebenSieBitte.setLineWrap(true); - txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - txtrGebenSieBitte.setBounds(145, 62, 350, 110); - panel_1.add(txtrGebenSieBitte); - - 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(10, 442, 136, 14); - contentPanel.add(lblPflichtfelder); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar - con.closeThriftConnection(); - EditImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - 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("Bearbeiten"); - lblNewLabel_1.setBounds(146, 11, 71, 14); - contentPanel.add(lblNewLabel_1); - { - buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - //Image.image.setImagename(imagename.getText()); - con.closeThriftConnection(); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("CANCEL"); - buttonPane.add(backButton); - - } - { - okButton = new JButton("Weiter"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - System.out.println("text length="+imagename.getText().length()); - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - - //TODO - //Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht - //der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF??? - if(imagename.getText().length() <= 0){ - JOptionPane.showMessageDialog(null, - "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", - JOptionPane.WARNING_MESSAGE); - } else { - Image.image.setNewName(imagename.getText()); - con.closeThriftConnection(); - EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); - ea.setVisible(true); - dispose(); - }//end else - } - }); - - 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); - //setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs})); - - } - - public void initData(){ - try { - - Map map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); - if(map.get("internet").equals("0")){ - Image.image.setInternet(false); - } - else - { - Image.image.setInternet(true); - } - if(map.get("license").equals("0")){ - Image.image.setLicensed(false); - } - else{ - Image.image.setLicensed(true); - } - Image.image.setImagename(map.get("name")); - Image.image.setRam(Integer.parseInt(map.get("ram"))); - Image.image.setCpu(Integer.parseInt(map.get("cpu"))); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - -} diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java deleted file mode 100644 index 3c6109ae..00000000 --- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java +++ /dev/null @@ -1,366 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.ButtonGroup; -import javax.swing.JButton; -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.JSeparator; -import javax.swing.JSpinner; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.SpinnerNumberModel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -import models.Image; - -@SuppressWarnings("serial") -public class EditImageTechnisch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JSpinner spinnerCPU; - JSpinner spinnerRam; - JRadioButton rdbtnlicenseJa; - JRadioButton rdbtnlicenseNein; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - private final ButtonGroup buttonGrouplicense = new ButtonGroup(); - private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - - - /** - * Create the dialog. - */ - public EditImageTechnisch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei Klick auf das X - - System.exit(0); - } - - }); - //Verhindert das Vergrößern des Fensters - setResizable(false); - - try { - //setzt das Look & Feel - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Titel des Fensters - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 95); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - rdbtnlicenseJa = new JRadioButton("Ja"); - rdbtnlicenseJa.setSelected(true); - buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 29, 109, 23); - panel_1.add(rdbtnlicenseJa); - - rdbtnlicenseNein = new JRadioButton("Nein"); - buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 29, 109, 23); - panel_1.add(rdbtnlicenseNein); - if(Image.image.isLicensed()==true){ - rdbtnlicenseJa.setSelected(true); - } - else - { - rdbtnlicenseNein.setSelected(true); - } - - - - JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - rdbtnInternetJa = new JRadioButton("Ja"); - buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 57, 109, 23); - panel_1.add(rdbtnInternetJa); - - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 57, 109, 23); - panel_1.add(rdbtnInternetNein); - if(Image.image.isInternet()==true){ - rdbtnInternetJa.setSelected(true); - } - else - { - rdbtnInternetNein.setSelected(true); - } - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Macht dieses Fenster unsichtbar und das vorhergehende Fenster sichtbar - EditImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 172, 557, 338); - contentPanel.add(panel_2); - - JTextArea txtrHinweisSolltenSie = new JTextArea(); - txtrHinweisSolltenSie.setBackground(SystemColor.menu); - txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); - txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); - txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); - panel_2.add(txtrHinweisSolltenSie); - - JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); - lblNewLabel_3.setBounds(10, 91, 280, 20); - panel_2.add(lblNewLabel_3); - - JLabel lblMindestens = new JLabel("mindestens"); - lblMindestens.setBounds(315, 91, 60, 20); - panel_2.add(lblMindestens); - - spinnerRam = new JSpinner(); - spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); - spinnerRam.setBounds(385, 88, 29, 20); - spinnerRam.setValue(Image.image.getRam()); - panel_2.add(spinnerRam); - - JLabel lblGbyte = new JLabel("GByte"); - lblGbyte.setBounds(424, 91, 46, 20); - panel_2.add(lblGbyte); - - JTextArea txtrBeispielWindows = new JTextArea(); - txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); - txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows.setBackground(SystemColor.menu); - txtrBeispielWindows.setBounds(20, 111, 280, 55); - panel_2.add(txtrBeispielWindows); - - JTextArea txtrBeispielWindows_1 = new JTextArea(); - txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); - txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows_1.setBackground(SystemColor.menu); - txtrBeispielWindows_1.setBounds(20, 226, 280, 55); - panel_2.add(txtrBeispielWindows_1); - - JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); - lblWieVieleCpus.setBounds(10, 201, 280, 20); - panel_2.add(lblWieVieleCpus); - - JLabel label_3 = new JLabel("mindestens"); - label_3.setBounds(315, 201, 60, 20); - panel_2.add(label_3); - - spinnerCPU = new JSpinner(); - spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); - spinnerCPU.setBounds(385, 198, 29, 20); - spinnerCPU.setValue(Image.image.getCpu()); - panel_2.add(spinnerCPU); - - JLabel lblKerne = new JLabel("Kerne"); - lblKerne.setBounds(424, 201, 46, 20); - panel_2.add(lblKerne); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Setzt die Imagewerte in das Model - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - //Öffnet das vorherige Fenster - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - //Öffnet das nächste Fenster - FTPEditUploader_GUI ea=new FTPEditUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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); - - } - - - - } - diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java deleted file mode 100644 index da4f6997..00000000 --- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java +++ /dev/null @@ -1,302 +0,0 @@ -package gui; - - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import javax.swing.JTextField; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; - -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; - -import models.Image; -import models.person; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -@SuppressWarnings("serial") -public class EingabeImageAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField imagename; - - /** - * Create the dialog. - */ - public EingabeImageAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet das Fenster auf X - System.exit(0); - } - @Override - public void windowOpened(WindowEvent arg0) { - imagename.requestFocusInWindow(); - } - }); - //Verhindert das Vergrößern des Fensters - setResizable(false); - - try { - //setzt das Look & Feel - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Titel - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 369); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 245, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEnabled(false); - Vorname.setEditable(false); - Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setColumns(10); - Vorname.setBounds(145, 245, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 276, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setColumns(10); - Nachname.setBounds(145, 276, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 307, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 307, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 338, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setBackground(Color.WHITE); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setColumns(10); - EMail.setBounds(145, 338, 350, 20); - panel_1.add(EMail); - - JLabel lblImagename = new JLabel("Imagename: *"); - lblImagename.setBackground(SystemColor.menu); - lblImagename.setBounds(10, 31, 125, 20); - panel_1.add(lblImagename); - - - imagename = new JTextField(); - imagename.setBackground(Color.WHITE); - imagename.setText((String) null); - imagename.setColumns(10); - imagename.setBounds(145, 31, 350, 20); - imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurück kommt zur Seite - panel_1.add(imagename); - - JTextArea txtrGebenSieBitte = new JTextArea(); - txtrGebenSieBitte.setEditable(false); - txtrGebenSieBitte.setBackground(SystemColor.menu); - txtrGebenSieBitte.setLineWrap(true); - txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - txtrGebenSieBitte.setBounds(145, 62, 350, 110); - panel_1.add(txtrGebenSieBitte); - - 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(10, 442, 136, 14); - contentPanel.add(lblPflichtfelder); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauptmenü - EingabeImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - Image.image.setImagename(imagename.getText()); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("Cancel"); - buttonPane.add(backButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Prüft die Eingabe - if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) - { - //Schreibt die Daten in das Model - Image.image.setImagename(imagename.getText()); - EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI(); - ea.setVisible(true); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Error", JOptionPane.ERROR_MESSAGE); - } - } - }); - continueButton.setActionCommand("OK"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(continueButton); - } - } - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 78, 597, 2); - getContentPane().add(separator); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - getContentPane().add(separator_1); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - menuBar.add(mnNewMenu_1); - - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnNewMenu_1.add(mntmFaq); - - JMenuItem mntmOtrs = new JMenuItem("OTRS"); - mnNewMenu_1.add(mntmOtrs); - - }//end main -} diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java deleted file mode 100644 index f31f811d..00000000 --- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java +++ /dev/null @@ -1,364 +0,0 @@ -package gui; - - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import javax.swing.JRadioButton; -import javax.swing.ButtonGroup; -import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; - -import models.Image; - -@SuppressWarnings("serial") -public class EingabeImageTechnisch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JSpinner spinnerCPU; - JSpinner spinnerRam; - JRadioButton rdbtnlicenseJa; - JRadioButton rdbtnlicenseNein; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - private final ButtonGroup buttonGrouplicense = new ButtonGroup(); - private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EingabeImageTechnisch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 124); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - rdbtnlicenseNein = new JRadioButton("Nein"); - buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 29, 46, 23); - panel_1.add(rdbtnlicenseNein); - - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 57, 46, 23); - panel_1.add(rdbtnInternetNein); - - JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - JButton btnInternetSettings = new JButton("Einstellungen..."); - btnInternetSettings.setEnabled(false); - btnInternetSettings.setBounds(439, 57, 108, 23); - panel_1.add(btnInternetSettings); - - rdbtnInternetJa = new JRadioButton("Ja"); - - buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 57, 41, 23); - panel_1.add(rdbtnInternetJa); - - rdbtnlicenseJa = new JRadioButton("Ja"); - rdbtnlicenseJa.setSelected(true); - buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 29, 41, 23); - panel_1.add(rdbtnlicenseJa); - - JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:"); - lblLizenzserverEintragen.setBounds(10, 85, 250, 20); - panel_1.add(lblLizenzserverEintragen); - - JButton btnLicenseServer = new JButton("Server-Adresse..."); - btnLicenseServer.setEnabled(false); - btnLicenseServer.setBounds(266, 84, 157, 23); - panel_1.add(btnLicenseServer); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(11, 196, 557, 338); - contentPanel.add(panel_2); - - JLabel lblGbyte = new JLabel("GByte"); - lblGbyte.setBounds(424, 91, 46, 20); - panel_2.add(lblGbyte); - - spinnerCPU = new JSpinner(); - spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); - spinnerCPU.setBounds(385, 188, 29, 20); - panel_2.add(spinnerCPU); - - JTextArea txtrBeispielWindows = new JTextArea(); - txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); - txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows.setBackground(SystemColor.menu); - txtrBeispielWindows.setBounds(10, 122, 280, 55); - panel_2.add(txtrBeispielWindows); - - - - JLabel lblKerne = new JLabel("Kerne"); - lblKerne.setBounds(424, 191, 46, 20); - panel_2.add(lblKerne); - - JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); - lblWieVieleCpus.setBounds(10, 191, 280, 20); - panel_2.add(lblWieVieleCpus); - - spinnerRam = new JSpinner(); - spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); - spinnerRam.setBounds(385, 88, 29, 20); - panel_2.add(spinnerRam); - - JLabel label_3 = new JLabel("mindestens"); - label_3.setBounds(315, 191, 60, 20); - panel_2.add(label_3); - - JLabel lblMindestens = new JLabel("mindestens"); - lblMindestens.setBounds(315, 91, 60, 20); - panel_2.add(lblMindestens); - - JTextArea txtrBeispielWindows_1 = new JTextArea(); - txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); - txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows_1.setBackground(SystemColor.menu); - txtrBeispielWindows_1.setBounds(10, 222, 280, 55); - panel_2.add(txtrBeispielWindows_1); - - JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); - lblNewLabel_3.setBounds(10, 91, 280, 20); - panel_2.add(lblNewLabel_3); - - JTextArea txtrHinweisSolltenSie = new JTextArea(); - txtrHinweisSolltenSie.setBackground(SystemColor.menu); - txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); - txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); - txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); - panel_2.add(txtrHinweisSolltenSie); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - - EingabeImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.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) { - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - FTPUploader_GUI ea=new FTPUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(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/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java deleted file mode 100644 index 5b2d4751..00000000 --- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java +++ /dev/null @@ -1,504 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -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.JSeparator; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import models.Image; -import models.Lecture; -import models.person; -import javax.swing.JTextArea; -import java.awt.ScrollPane; -import java.util.Calendar; -import java.util.Date; - -import com.toedter.calendar.JDateChooser; -import javax.swing.JRadioButton; - -@SuppressWarnings("serial") -public class EingabeVeranstaltungAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField txtFldVeranstaltungsname; - JTextArea description; - JRadioButton radioButtonyes; - JRadioButton radioButtonno; - JDateChooser dateChooserend; - JDateChooser dateChooserstart; - Date startDate = new Date(); - Date endDate; - int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft - // aktiv sein darf - boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, - isAllInformationReady = false; - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EingabeVeranstaltungAllgemein_GUI dialog = new EingabeVeranstaltungAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EingabeVeranstaltungAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - - @Override - public void windowOpened(WindowEvent arg0) { - txtFldVeranstaltungsname.requestFocusInWindow(); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 21); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 331, 557, 162); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 33, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEditable(false); - Vorname.setEnabled(false); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setBackground(Color.WHITE); - Vorname.setColumns(10); - Vorname.setBounds(145, 33, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 64, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setBackground(Color.WHITE); - Nachname.setColumns(10); - Nachname.setBounds(145, 64, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 95, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setBackground(Color.WHITE); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 95, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 126, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setBackground(Color.WHITE); - EMail.setColumns(10); - EMail.setBounds(145, 126, 350, 20); - panel_1.add(EMail); - - 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) { - - EingabeVeranstaltungAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 36, 557, 284); - contentPanel.add(panel_2); - - JLabel label_3 = new JLabel("Laborname (Anzeigename): *"); - label_3.setBounds(10, 25, 180, 14); - panel_2.add(label_3); - - txtFldVeranstaltungsname = new JTextField(); - txtFldVeranstaltungsname.setColumns(10); - txtFldVeranstaltungsname.setBounds(200, 22, 347, 20); - txtFldVeranstaltungsname.setText(Lecture.lecture.getName()); - panel_2.add(txtFldVeranstaltungsname); - - JTextArea textArea = new JTextArea(); - textArea.setEditable(false); - textArea.setWrapStyleWord(true); - textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - textArea.setLineWrap(true); - textArea.setFont(new Font("Tahoma", Font.PLAIN, 12)); - textArea.setBackground(SystemColor.menu); - textArea.setBounds(10, 49, 537, 49); - panel_2.add(textArea); - - JLabel lblDesc = new JLabel("Beschreibung: *"); - lblDesc.setBounds(10, 111, 180, 14); - panel_2.add(lblDesc); - - ScrollPane scrollPane = new ScrollPane(); - scrollPane.setBounds(200, 104, 347, 78); - panel_2.add(scrollPane); - description = new JTextArea(); - description.setFont(new Font("Tahoma", Font.PLAIN, 11)); - description.setLineWrap(true); - description.setText(Lecture.lecture.getDesc()); - scrollPane.add(description); - description.setBounds(0, 0, 4, 22); - scrollPane.add(description); - - dateChooserend = new JDateChooser(); - endDate = addDays(new Date(), maxLifeTime); // Datum darf weiter als 6 - // Monate in der Zukunft - // liegen - dateChooserend.setDate(endDate); - if (Lecture.lecture.getEnddate() == null) { - // is not defined yet - dateChooserend.setDate(endDate); - } else { - // already defined from last visit on this page - dateChooserend.setDate(Lecture.lecture.getEnddate()); - } - dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss"); - dateChooserend.setBounds(404, 188, 143, 20); - panel_2.add(dateChooserend); - - JLabel lblBis = new JLabel("bis:"); - lblBis.setBounds(378, 188, 21, 20); - panel_2.add(lblBis); - - dateChooserstart = new JDateChooser(); - if (Lecture.lecture.getStartdate() == null) { - // is not defined yet - dateChooserstart.setDate(startDate); - } else { - // already defined from last visit on this page - dateChooserstart.setDate(Lecture.lecture.getStartdate()); - } - dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); - dateChooserstart.setBounds(226, 188, 143, 20); - panel_2.add(dateChooserstart); - - JLabel label_6 = new JLabel("von:"); - label_6.setBounds(200, 188, 30, 20); - panel_2.add(label_6); - - JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *"); - label_10.setBounds(10, 194, 127, 14); - panel_2.add(label_10); - - JLabel label_11 = new JLabel("Aktiv:"); - label_11.setBounds(10, 229, 127, 14); - panel_2.add(label_11); - - radioButtonyes = new JRadioButton("Ja"); - radioButtonyes.setSelected(true); - radioButtonyes.setBounds(200, 225, 73, 23); - panel_2.add(radioButtonyes); - - radioButtonno = new JRadioButton("Nein"); - radioButtonyes.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - radioButtonyes.setSelected(true); - radioButtonno.setSelected(false); - } - }); - radioButtonno.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - radioButtonno.setSelected(true); - radioButtonyes.setSelected(false); - } - }); - radioButtonno.setBounds(296, 225, 73, 23); - panel_2.add(radioButtonno); - - JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)"); - lblimVmchooserSichtbar.setBounds(10, 245, 127, 14); - panel_2.add(lblimVmchooserSichtbar); - - JLabel lblmaxMonate = new JLabel("(max. 6 Monate)"); - lblmaxMonate.setBounds(10, 208, 127, 14); - panel_2.add(lblmaxMonate); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if (radioButtonyes.isSelected() == true) { - Lecture.lecture.setActive(true); - } else { - Lecture.lecture.setActive(false); - } - - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); - - MainMenue_GUI sr = new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("Cancel"); - buttonPane.add(backButton); - getRootPane().setDefaultButton(backButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - // liegt das End-Datum vor dem Start-Datum? - if (dateChooserend.getDate().before( - dateChooserstart.getDate())) { - // datum ist falsch rum - isDateOrderCorrect = false; - JOptionPane - .showMessageDialog( - null, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", - "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // bereit - isDateOrderCorrect = true; - } - // liegt das eingegebene Datum nach dem erlaubten - // End-Datum? - if (dateChooserend.getDate().after(endDate)) { - // Datum zu weit weg - isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(null, - "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" - + endDate, "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // bereit - isDateMaxLifeTimeCorrect = true; - } - // Prüfen ob alles eingegeben wurde - if (txtFldVeranstaltungsname.getText().isEmpty() == true - || description.getText().isEmpty() == true) { - // mind 1 Textfeld ist leer - isAllInformationReady = false; - JOptionPane - .showMessageDialog( - null, - "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", - "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // Textfelder bereit - isAllInformationReady = true; - } - - // welcher Radiobutton ist geklickt? - if (radioButtonyes.isSelected() == true) { - Lecture.lecture.setActive(true); - } else { - Lecture.lecture.setActive(false); - } - // Prüfe ob alle Eingaben korrekt sind, dann mache - // weiter - if (isAllInformationReady == true - && isDateMaxLifeTimeCorrect == true - && isDateOrderCorrect == true) { - // everything is ok, proceed - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart - .getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); - - LinkImage_GUI ev = new LinkImage_GUI(); - ev.setVisible(true); - dispose(); - } - - } - }); - 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); - - JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(32, 602, 136, 14); - getContentPane().add(lblPflichtfelder); - - 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); - - } - - public Date addDays(Date date, int days) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.DATE, days); // minus number would decrement the days - return cal.getTime(); - } -} diff --git a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java deleted file mode 100644 index 7f042cae..00000000 --- a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java +++ /dev/null @@ -1,234 +0,0 @@ -package gui; - - -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.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -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.JPanel; -import javax.swing.JSeparator; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -@SuppressWarnings("serial") -public class ExtendedSearch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField textField; - private JTextField textField_1; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - ExtendedSearch_GUI dialog = new ExtendedSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public ExtendedSearch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width -603) / 2; - setBounds(left, top, 603, 722); - - 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("Weitere Suchoptionen"); - 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("beschreibung"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 11, 557, 95); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Image-Typ"); - lblNewLabel_2.setBounds(10, 39, 176, 20); - panel_1.add(lblNewLabel_2); - - JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image"); - chckbxBestehendesImage.setSelected(true); - chckbxBestehendesImage.setBounds(192, 38, 138, 23); - panel_1.add(chckbxBestehendesImage); - - JCheckBox chckbxRohling = new JCheckBox("Rohling"); - chckbxRohling.setSelected(true); - chckbxRohling.setBounds(332, 38, 97, 23); - panel_1.add(chckbxRohling); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 117, 557, 95); - contentPanel.add(panel); - - JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software"); - lblEnthalteneSoftware.setBounds(10, 39, 176, 20); - panel.add(lblEnthalteneSoftware); - - textField = new JTextField(); - textField.setBounds(196, 39, 351, 20); - panel.add(textField); - textField.setColumns(10); - - JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben"); - lblNewLabel_1.setBounds(196, 70, 351, 14); - panel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 223, 557, 123); - contentPanel.add(panel_2); - - JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers"); - lblNachnameDesErstellers.setBounds(10, 39, 176, 20); - panel_2.add(lblNachnameDesErstellers); - - textField_1 = new JTextField(); - textField_1.setColumns(10); - textField_1.setBounds(196, 39, 351, 20); - panel_2.add(textField_1); - - JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t"); - lblHochschuleuniversitt.setBounds(10, 70, 176, 20); - panel_2.add(lblHochschuleuniversitt); - - JComboBox comboBox = new JComboBox(); - comboBox.setBounds(196, 70, 351, 20); - panel_2.add(comboBox); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("\u00DCbernehmen"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - - FTPUploader_GUI ea=new FTPUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java deleted file mode 100644 index cb53fc3d..00000000 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ /dev/null @@ -1,370 +0,0 @@ -package gui; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import java.io.File; - -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; - -import ftp.DownloadTask; - -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.SystemColor; -import java.awt.Font; -import javax.swing.JTextPane; -import javax.swing.JSeparator; - -import models.Image; - -import org.apache.thrift.TException; - -import server.Server.Client; -import server.User; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { - - @SuppressWarnings("unused") - private JPanel contentPane; - private final JPanel contentPanel = new JPanel(); - JLabel lblNewLabel; - JLabel downspeed; - User user; - JProgressBar progressBar; - String host = "141.79.128.121"; - int port = 21; - String username = "openslx"; - String password = "openslx-ng"; - String downloadFile = ""; - static String arg = ""; - DownloadTask task; - JLabel bytesreadlbl; - JLabel lblNewLabel_3; - JLabel labelVerbleibend; - long filesize; - double speed; - long bytesread; - JLabel labelZeit; - boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); - JButton buttonback = new JButton("Zur\u00FCck"); - - /** - * Launch the application. - */ - /* - * public static void main(String[] args) { EventQueue.invokeLater(new - * Runnable() { public void run() { try { FTPDownloader frame = new - * FTPDownloader(); frame.setVisible(true); } catch (Exception e) { - * e.printStackTrace(); } } }); } - */ - - /** - * Create the frame. - */ - public FTPDownloader_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - if (taskrun == true) { - try { - client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - dispose(); - } - }); - setResizable(false); - // setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - - - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - contentPanel.setLayout(null); - { - JButton btnSpeicherortAuswhlen = new JButton( - "Speicherort ausw\u00E4hlen"); - btnSpeicherortAuswhlen.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - - fc.showOpenDialog(getParent()); - File dir = fc.getSelectedFile(); - lblNewLabel.setText(dir.getAbsolutePath()); - } - }); - - btnSpeicherortAuswhlen.setBounds(57, 124, 141, 23); - btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); - contentPanel.add(btnSpeicherortAuswhlen); - } - - lblNewLabel = new JLabel("C:\\"); - lblNewLabel.setBounds(208, 124, 238, 23); - contentPanel.add(lblNewLabel); - - JButton btnDownloadStarten = new JButton("Download starten"); - btnDownloadStarten.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - buttonDownloadActionPerformed(arg0); - } - }); - - btnDownloadStarten.setBounds(57, 168, 141, 23); - contentPanel.add(btnDownloadStarten); - - progressBar = new JProgressBar(0, 100); - progressBar.setStringPainted(true); - - progressBar.setBounds(57, 202, 497, 30); - contentPanel.add(progressBar); - - JLabel lblDownloadgeschwindigkeit = new JLabel( - "Downloadgeschwindigkeit:"); - lblDownloadgeschwindigkeit.setBounds(57, 243, 141, 14); - contentPanel.add(lblDownloadgeschwindigkeit); - - downspeed = new JLabel("0"); - downspeed.setBounds(308, 243, 95, 14); - contentPanel.add(downspeed); - - JLabel lblNewLabel_1 = new JLabel("Fertig:"); - lblNewLabel_1.setBounds(57, 293, 46, 14); - contentPanel.add(lblNewLabel_1); - - bytesreadlbl = new JLabel(""); - bytesreadlbl.setBounds(66, 244, 108, 14); - contentPanel.add(bytesreadlbl); - - JLabel lblNewLabel_2 = new JLabel("von:"); - lblNewLabel_2.setBounds(226, 293, 46, 14); - contentPanel.add(lblNewLabel_2); - - lblNewLabel_3 = new JLabel(""); - lblNewLabel_3.setBounds(235, 244, 108, 14); - contentPanel.add(lblNewLabel_3); - - JLabel lblMbVerbleibend = new JLabel("Verbleibend:"); - lblMbVerbleibend.setBounds(57, 318, 71, 14); - contentPanel.add(lblMbVerbleibend); - - labelVerbleibend = new JLabel(""); - labelVerbleibend.setBounds(91, 269, 108, 14); - contentPanel.add(labelVerbleibend); - - JLabel lblGeschtzteVerbleibendeZeit = new JLabel( - "Gesch\u00E4tzte Verbleibende Zeit:"); - lblGeschtzteVerbleibendeZeit.setBounds(57, 268, 150, 14); - contentPanel.add(lblGeschtzteVerbleibendeZeit); - - labelZeit = new JLabel(""); - labelZeit.setBounds(261, 219, 117, 14); - contentPanel.add(labelZeit); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBackground(SystemColor.menu); - 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); - - 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); - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); - contentPanel.add(separator); - - JLabel label_1 = new JLabel("Hauptmen\u00FC"); - label_1.setForeground(Color.BLUE); - label_1.setBounds(20, 88, 61, 20); - contentPanel.add(label_1); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(80, 91, 14, 14); - contentPanel.add(label_2); - - JLabel label_3 = new JLabel("VL-Image"); - label_3.setForeground(Color.BLUE); - label_3.setBounds(91, 88, 46, 20); - contentPanel.add(label_3); - - JLabel label_4 = new JLabel(">"); - label_4.setBounds(139, 91, 14, 14); - contentPanel.add(label_4); - - JLabel label_5 = new JLabel("Neu/Bearbeiten"); - label_5.setBounds(149, 91, 108, 14); - contentPanel.add(label_5); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(-10, 648, 597, 2); - contentPanel.add(separator_1); - - JLabel label_6 = new JLabel("1."); - label_6.setBounds(24, 128, 23, 14); - contentPanel.add(label_6); - - JLabel label_7 = new JLabel("2."); - label_7.setBounds(24, 172, 23, 14); - contentPanel.add(label_7); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBackground(UIManager.getColor("Button.background")); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - buttonback.setEnabled(false); - buttonback.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if (taskrun == true) { - task.cancel(true); - try { - client.DeleteFtpUser(user.userName); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - thrift.closeThriftConnection(); - SearchEditImage_GUI se=new SearchEditImage_GUI(); - se.setVisible(true); - dispose(); - } - }); - buttonback.setActionCommand("Cancel"); - buttonPane.add(buttonback); - } - } - setVisible(true); - - } - - private void buttonDownloadActionPerformed(ActionEvent event) { - - progressBar.setValue(0); - - try { - user = client.getFtpUser(); - - downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); - - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - task = new DownloadTask(host, port, user.userName, user.password, - downloadFile, lblNewLabel.getText(), this); - task.addPropertyChangeListener(this); - task.execute(); - taskrun = true; - - } - - public void propertyChange(PropertyChangeEvent arg0) { - - int progress = 0; - if ("progress" == arg0.getPropertyName()) { - progress = (Integer) arg0.getNewValue(); - progressBar.setValue(progress); - if (progress == 100) { - buttonback.setEnabled(true); - } - } - - if ("speed" == arg0.getPropertyName()) { - speed = (double) arg0.getNewValue(); - // if(speed<=1){ - - downspeed.setText(String.valueOf(speed).substring(0, - String.valueOf(speed).lastIndexOf(".") + 3) - + " MB/s"); - - // }else - // { - // double MBSpeed=speed/1024; - // downspeed.setText(String.valueOf((MBSpeed)).substring(0, - // String.valueOf(MBSpeed).indexOf("."))); - // } - - } - if ("bytesread" == arg0.getPropertyName()) { - bytesread = (long) arg0.getNewValue(); - bytesreadlbl.setText((bytesread / 1024 / 1024) + " MB"); - labelVerbleibend - .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) - + " MB"); - - labelZeit - .setText(String - .valueOf( - ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) - .substring( - 0, - String.valueOf( - (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) - .lastIndexOf(".")) - + " Minuten"); - - } - if ("filesize" == arg0.getPropertyName()) { - filesize = (long) arg0.getNewValue(); - lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB"); - - } - - } -} \ No newline at end of file diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java deleted file mode 100644 index 93ea12e7..00000000 --- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java +++ /dev/null @@ -1,512 +0,0 @@ -package gui; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.EventQueue; -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.WindowAdapter; -import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.JSeparator; -import javax.swing.JTextPane; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import models.Image; -import models.person; -import org.apache.thrift.TException; -import server.Server.Client; -import thrift.ThriftConnection; -//import util.XMLCreator; -import ftp.UploadTask; - -@SuppressWarnings("serial") -public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - - @SuppressWarnings("unused") - private JPanel contentPane; - private final JPanel contentPanel = new JPanel(); - JLabel lblNewLabel; - JProgressBar progressBar; - String host = "141.79.128.121"; - int port = 21; - server.User user; - String filename = ""; - File uploadFile; - static String arg = ""; - UploadTask task; - JLabel UpSpeed; - JLabel labelfertig; - JLabel labelfilesize; - JLabel labelZeit; - JLabel labelverbleibend; - long filesize; - double speed; - long bytesread; - boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); - JButton finishButton = new JButton("Fertigstellen"); - JButton btnUploadStarten = new JButton("Upload auf Server starten"); - JButton btnZurck = new JButton("Zur\u00FCck"); - int progress = 0; // progress of upload - - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPUploader_GUI frame = new FTPUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the frame. - */ - public FTPUploader_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - if (taskrun == true) { - try { - - client.DeleteFtpUser(user.userName); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - } - }); - setResizable(false); - // setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - // filename=name; - setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 250); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - contentPanel.setLayout(null); - { - JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); - btnSpeicherortAuswhlen.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.FILES_ONLY); - - fc.showOpenDialog(getParent()); - File file = fc.getSelectedFile(); - // check if a file is selected and exists - if (file != null) { - System.out.println("File to upload exists"); - uploadFile = file; - filename = uploadFile.getName(); - lblNewLabel.setText(file.getAbsolutePath()); - } else { - System.out.println("No file selected"); - lblNewLabel.setText(""); - }// end if - } - }); - - btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23); - btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - contentPanel.add(btnSpeicherortAuswhlen); - } - - lblNewLabel = new JLabel(""); - lblNewLabel.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent arg0) { - if (lblNewLabel.getText().isEmpty()) { - // wenn leer, dann upload button nicht freigeben - btnUploadStarten.setEnabled(false); - } else { - // wenn leer, dann upload button nicht freigeben - btnUploadStarten.setEnabled(true); - } - } - }); - lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); - lblNewLabel.setBounds(285, 124, 302, 23); - contentPanel.add(lblNewLabel); - - btnUploadStarten.setEnabled(false); - btnUploadStarten.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - buttonUploadActionPerformed(arg0); - - } - }); - - btnUploadStarten.setBounds(102, 168, 173, 23); - contentPanel.add(btnUploadStarten); - - progressBar = new JProgressBar(0, 100); - progressBar.setStringPainted(true); - - progressBar.setBounds(102, 202, 485, 30); - contentPanel.add(progressBar); - - JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:"); - lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14); - contentPanel.add(lblUploadgeschwindigkeit); - - JLabel label_1 = new JLabel("Fertig:"); - label_1.setBounds(102, 293, 46, 14); - contentPanel.add(label_1); - - labelfertig = new JLabel("0"); - labelfertig.setHorizontalAlignment(SwingConstants.LEFT); - labelfertig.setBounds(183, 293, 108, 14); - contentPanel.add(labelfertig); - - UpSpeed = new JLabel("0"); - UpSpeed.setHorizontalAlignment(SwingConstants.LEFT); - UpSpeed.setBounds(374, 243, 117, 14); - contentPanel.add(UpSpeed); - - JLabel label_4 = new JLabel("von:"); - label_4.setBounds(318, 293, 46, 14); - contentPanel.add(label_4); - - labelfilesize = new JLabel("0"); - labelfilesize.setHorizontalAlignment(SwingConstants.LEFT); - labelfilesize.setBounds(374, 293, 117, 14); - contentPanel.add(labelfilesize); - - JLabel label_6 = new JLabel("Verbleibend:"); - label_6.setBounds(102, 318, 71, 14); - contentPanel.add(label_6); - - JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); - label_7.setBounds(102, 268, 150, 14); - contentPanel.add(label_7); - - labelZeit = new JLabel("0"); - labelZeit.setHorizontalAlignment(SwingConstants.LEFT); - labelZeit.setBounds(374, 268, 117, 14); - contentPanel.add(labelZeit); - - labelverbleibend = new JLabel("0"); - labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT); - labelverbleibend.setBounds(183, 318, 108, 14); - contentPanel.add(labelverbleibend); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); - contentPanel.add(panel); - - JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image"); - lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18)); - lblUploadIhresImage.setBounds(10, 11, 509, 22); - panel.add(lblUploadIhresImage); - - JTextPane txtpnFhreSieBitte = new JTextPane(); - txtpnFhreSieBitte - .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); - txtpnFhreSieBitte.setEditable(false); - txtpnFhreSieBitte.setBackground(SystemColor.menu); - txtpnFhreSieBitte.setBounds(10, 36, 509, 32); - panel.add(txtpnFhreSieBitte); - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); - contentPanel.add(separator); - - JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); - lblNewLabel_1.setForeground(Color.BLUE); - lblNewLabel_1.setBounds(20, 88, 61, 20); - contentPanel.add(lblNewLabel_1); - - JLabel label_3 = new JLabel(">"); - label_3.setBounds(80, 91, 14, 14); - contentPanel.add(label_3); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(91, 88, 46, 20); - contentPanel.add(lblVlimage); - - JLabel label_5 = new JLabel(">"); - label_5.setBounds(139, 91, 14, 14); - contentPanel.add(label_5); - - JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten"); - lblNeubearbeiten.setBounds(149, 91, 108, 14); - contentPanel.add(lblNeubearbeiten); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - contentPanel.add(separator_1); - - JButton btnCopyFileTo = new JButton("Copy File to Prod"); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - System.out.println("Copying file to " + user.path + "/" - + uploadFile.getName()); - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - btnCopyFileTo.setBounds(102, 343, 173, 23); - contentPanel.add(btnCopyFileTo); - - JLabel lblShritt = new JLabel("Schritt 1:"); - lblShritt.setBounds(24, 128, 57, 14); - contentPanel.add(lblShritt); - - JLabel lblSchritt = new JLabel("Schritt 2:"); - lblSchritt.setBounds(24, 172, 57, 14); - contentPanel.add(lblSchritt); - - JLabel lblSchritt_1 = new JLabel("Schritt 3:"); - lblSchritt_1.setBounds(20, 391, 57, 14); - contentPanel.add(lblSchritt_1); - - JLabel lblKlickenSieAuf = new JLabel( - "Klicken Sie auf \"Fertigstellen\"."); - lblKlickenSieAuf.setBounds(98, 391, 241, 14); - contentPanel.add(lblKlickenSieAuf); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBackground(UIManager.getColor("Button.background")); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - // Button for starting upload - // JButton finishButton = new JButton("Fertigstellen"); - finishButton.setEnabled(false); - finishButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - writeData(); - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - if (taskrun == true) { - try { - client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - - } - }); - - btnZurck.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - dispose(); - EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI(); - m.setVisible(true); - } - }); - btnZurck.setActionCommand("Cancel"); - buttonPane.add(btnZurck); - finishButton.setActionCommand("Cancel"); - buttonPane.add(finishButton); - } - } - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); - setVisible(true); - - } - - private void buttonUploadActionPerformed(ActionEvent event) { - // File (or directory) with old name - // File file = new File(lblNewLabel.getText()); - - // File (or directory) with new name - // System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk"); - // File file2 = new - // File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk"); - - // Rename file (or directory) - // boolean success = file.renameTo(file2); - // if (!success) { - // File was not successfully renamed - // System.out.println("Not OK"); - // } - // else - // { - // System.out.println("OK"); - // } - progressBar.setValue(0); - btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick - // und - - try { - user = client.getFtpUser(); - System.out.println("name" + user.userName); - System.out.println("path" + user.path); - System.out.println("pass" + user.password); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); - - System.out.println(formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); - Image.image.setNewName(formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); - task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); - - task.addPropertyChangeListener(this); - task.execute(); - taskrun = true; - - // createXML(); - // TransferToSatellit(); - - } - - public void propertyChange(PropertyChangeEvent arg0) { - progress = 0; - if ("progress" == arg0.getPropertyName()) { - progress = (Integer) arg0.getNewValue(); - progressBar.setValue(progress); - - // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (progress == 100) { - finishButton.setEnabled(true); - - } - if (progress == 0 || progress == 100) { - // not uploading currently - btnZurck.setEnabled(true); - } else { - // currently uploading, don't let user interact - btnZurck.setEnabled(false); - } - - } - - if ("speed" == arg0.getPropertyName()) { - speed = (double) arg0.getNewValue(); - // if(speed<=1){ - - UpSpeed.setText(String.valueOf(speed).substring(0, - String.valueOf(speed).lastIndexOf(".") + 3) - + " MB/s"); - - // }else - // { - // double MBSpeed=speed/1024; - // downspeed.setText(String.valueOf((MBSpeed)).substring(0, - // String.valueOf(MBSpeed).indexOf("."))); - // } - - } - if ("bytesread" == arg0.getPropertyName()) { - bytesread = (long) arg0.getNewValue(); - labelfertig.setText((bytesread / 1024 / 1024) + " MB"); - labelverbleibend - .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) - + " MB"); - - labelZeit - .setText(String - .valueOf( - ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) - .substring( - 0, - String.valueOf( - (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) - .lastIndexOf(".")) - + " Minuten"); - - } - if ("filesize" == arg0.getPropertyName()) { - filesize = (long) arg0.getNewValue(); - labelfilesize.setText((filesize / 1024 / 1024) + " MB"); - - } - - } - - public boolean writeData() { - - try { - - client.writeVLdata(Image.image.getImagename(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), - Image.image.isLicensed(), Image.image.isInternet(), - Image.image.getRam(), Image.image.getCpu(), - "/srv/openslx/nfs/temp/" + Image.image.getNewName()); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - return false; - } - return true; - - } -} \ No newline at end of file diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/GUI/LinkImage_GUI.java deleted file mode 100644 index b4052778..00000000 --- a/Dozentenmodul/src/GUI/LinkImage_GUI.java +++ /dev/null @@ -1,471 +0,0 @@ -package 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.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -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; -import javax.swing.JSeparator; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableModel; - -import models.Lecture; -import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class LinkImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - private JTextField textFieldName; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - LinkImage_GUI dialog = new LinkImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public LinkImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - - @Override - public void windowOpened(WindowEvent arg0) { - textFieldName.requestFocusInWindow(); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 603) / 2; - int left = (screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel model = new DefaultTableModel(titles, 0); - - 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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - textFieldName = new JTextField(); - textFieldName.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - String stext = textFieldName.getText(); - modelAll.setRowCount(0); - initTableModel(modelAll); - - if (stext != "") - for (int i = 0; i < modelAll.getRowCount(); i++) { - - if (modelAll.getValueAt(i, 0).toString() - .startsWith(stext)) { - - } else { - modelAll.removeRow(i); - } - } - - } - - }); - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel( - "Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - ExtendedSearch_GUI es = new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - List list = client.getAllOS(); - comboBox.addItem(""); - for (int i = 0; i < list.size(); i++) { - comboBox.addItem(list.get(i)); - } - } catch (TException e2) { - // TODO Auto-generated catch block - e2.printStackTrace(); - } - comboBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - modelAll.setRowCount(0); - initTableModel(modelAll); - String selItem = comboBox.getSelectedItem().toString(); - if (selItem != "") { - for (int i = 0; i < modelAll.getRowCount(); i++) { - - if (modelAll.getValueAt(i, 2).equals(selItem)) { - - } else { - modelAll.removeRow(i); - } - } - - } - } - }); - 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) { - - LinkImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); - - tabbedPane.setBounds(10, 197, 557, 300); - contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - JTable tablemyImages = new JTable(); - tablemyImages.setModel(model); - 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(); - - 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(); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages = new JTable(); - 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 Images", null, scrollPaneCoopImages, - null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - initTableModel(modelAll); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); - EingabeVeranstaltungAllgemein_GUI eVAG = new EingabeVeranstaltungAllgemein_GUI(); - eVAG.setVisible(true); - dispose(); - } - }); - cancelButton.setActionCommand("CANCEL"); - buttonPane.add(cancelButton); - getRootPane().setDefaultButton(cancelButton); - } - { - JButton doLinkButton = new JButton( - "Veranstaltung erzeugen und abschlie\u00DFen"); - doLinkButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - String imagename = tableAllImages.getValueAt( - tableAllImages.getSelectedRow(), 0).toString(); - try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - System.out.println("Veranstaltung anlegen um: " - + formatter.format( - Lecture.lecture.getStartdate()) - .toString()); - client.writeLecturedata( - Lecture.lecture.getName(), - Lecture.lecture.getShortDesc(), - Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), Lecture.lecture - .isActive(), imagename, - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); - JOptionPane - .showMessageDialog( - null, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.PLAIN_MESSAGE); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane - .showMessageDialog( - null, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", JOptionPane.ERROR_MESSAGE); - } - con.closeThriftConnection(); - dispose(); - - } - }); - doLinkButton.setActionCommand("OK"); - buttonPane.add(doLinkButton); - } - } - - 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); - - } - - public DefaultTableModel initTableModel(DefaultTableModel model) { - List images; - try { - images = client.getImageList(); - Iterator i = images.iterator(); - List ListObj = new ArrayList(); - int x = 0; - - while (i.hasNext()) { - - i.next(); - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), - images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; - ListObj.add(obj); - model.addRow(ListObj.get(x)); - x++; - - } - - return model; - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return model; - } - -} diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java deleted file mode 100644 index 172895d6..00000000 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ /dev/null @@ -1,260 +0,0 @@ -package gui; - -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.Image; -import java.awt.SystemColor; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JTextField; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; - -import models.SessionData; -import models.person; -import org.apache.thrift.TException; -//import org.apache.thrift.protocol.TBinaryProtocol; -//import org.apache.thrift.protocol.TProtocol; -import org.ini4j.Wini; -//import thrift.AuthenticationException; -//import thrift.ImageServer; -//import thrift.InvalidTokenException; -//import thrift.SessionData; -import thrift.MasterThriftConnection; -import thrift.ImageServer.Client; -import thrift.UserInfo; - -import config.config_file; - -@SuppressWarnings("serial") -public class Login_GUI extends JFrame { - - private JPanel contentPane; - private JTextField username; - private JPasswordField pass; - - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - // Prüfe und Erzeuge gegebenfalls Config - config_file cf = new config_file(); - boolean conf = cf.createConfig(); - if (conf == true) { - // Aufruf und Anzeige des Login Fensters - Login_GUI frame = new Login_GUI(); - frame.setVisible(true); - } else { - JOptionPane.showMessageDialog(null, - "Fehler beim erzeugen der Konfigurationsfile", - "Message", JOptionPane.ERROR_MESSAGE); - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the frame. - */ - public Login_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - - // Fenster darf nicht vergrößert werden - setResizable(false); - try { - // Setzt das Look and Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - // Titel des Fensters setzen - setTitle("Dozentenmodul *Prototyp*"); - // Aktion die beim Schließen durchgeführt werden soll - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - // Größe des Fensters definieren - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 400) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 400); - // Erzeugen eines Panels - contentPane = new JPanel(); - // Hintergrund Farbe des Panels setzen - contentPane.setBackground(SystemColor.menu); - // Rahmen des Fensters setzen - contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); - setContentPane(contentPane); - // Layout setzen - contentPane.setLayout(null); - // Label für das Logo erzeugen - JLabel imgLabel = new JLabel(); - // Größe und Position des Logos festelegen - imgLabel.setBounds(150, 11, 350, 142); - // Pfadangabe des Logos - - ImageIcon icon = new ImageIcon(getClass().getResource( - "/Logo_bwLehrpool.png"), "Logo"); - // Skalierung des Logos - Image scaled = icon.getImage().getScaledInstance(270, 64, 0); - imgLabel.setIcon(new ImageIcon(scaled)); - // Hinzufügen des Logos in das Fenster - contentPane.add(imgLabel); - - // Erzeugen und Hinzufügen des Labels - JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); - LabelUser.setBounds(111, 164, 134, 20); - 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() { - public void actionPerformed(ActionEvent arg0) { - performLogin(); - } - }); - username.setBounds(304, 164, 196, 20); - contentPane.add(username); - username.setColumns(10); - - // Erzeugen und Hinzufügen des Labels - JLabel LabelPass = new JLabel("bwIDM-Passwort:"); - LabelPass.setBounds(111, 195, 134, 20); - contentPane.add(LabelPass); - - // Erzeugen, Hinzufügen und definierung der Aktion des Buttons - JButton BtnLogin = new JButton("Login"); - BtnLogin.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - performLogin(); - }// end actionPerformed - }); - - BtnLogin.setBounds(304, 244, 196, 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() { - public void actionPerformed(ActionEvent e) { - performLogin(); - } - }); - pass.setBounds(304, 195, 196, 20); - contentPane.add(pass); - }// end LoginGUI() - - //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; - try { - String passText = new String(pass.getPassword()); - System.out.println(username.getText() + " " + passText); - result = client.authenticate(username.getText(), passText); - - } catch (thrift.AuthenticationException e) { - System.out.println("Authentifizierung fehlgeschlagen: " + e.message); - JOptionPane.showMessageDialog(null, - "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", - "Anmeldung fehlgeschlagen", - JOptionPane.ERROR_MESSAGE); - - return; - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - 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(); - } - - } else { - JOptionPane.showMessageDialog(null, "Login denied!", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - }// end performLogin - -}// end class diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java deleted file mode 100644 index 7cf7face..00000000 --- a/Dozentenmodul/src/GUI/MainMenue_GUI.java +++ /dev/null @@ -1,443 +0,0 @@ -package gui; - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JRadioButton; -import javax.swing.SwingConstants; -import javax.swing.ButtonGroup; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.ToolTipManager; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.ScrollPane; -import javax.swing.JTextArea; -import javax.swing.ImageIcon; - -@SuppressWarnings("serial") -public class MainMenue_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - String descNewImage, descEditImage, descDeleteImage, descSearchImage, - descNewLecture, descEditLecture, descDeleteLecture, - descSearchLecture = ""; - JRadioButton rdbtnImageNew; - JRadioButton rdbtnImageEdit; - JRadioButton rdbtnImageSearchDownload; - JRadioButton rdbtnVeranstaltungNew; - JRadioButton rdbtnImageDelete; - JRadioButton rdbtnVeranstaltungEdit; - private final ButtonGroup buttonGroup = new ButtonGroup(); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - MainMenue_GUI dialog = new MainMenue_GUI(); - dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - }// end main - - /** - * Create the dialog. - */ - public MainMenue_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 545, 366); - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 567, 69); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hauptmen\u00FC"); - 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("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion."); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 104, 567, 502); - contentPanel.setBackground(SystemColor.menu); - - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JPanel panelImage = new JPanel(); - panelImage.setBackground(SystemColor.menu); - panelImage.setBorder(new TitledBorder(null, "VL-Image", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelImage.setBounds(10, 146, 270, 170); - contentPanel.add(panelImage); - panelImage.setLayout(null); - - rdbtnImageNew = new JRadioButton("Neu"); - rdbtnImageNew - .setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden"); - rdbtnImageNew.setBounds(6, 22, 159, 23); - panelImage.add(rdbtnImageNew); - rdbtnImageNew.setSelected(true); - buttonGroup.add(rdbtnImageNew); - rdbtnImageNew.setBackground(SystemColor.menu); - - rdbtnImageEdit = new JRadioButton("Bearbeiten"); - rdbtnImageEdit - .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageEdit.setBounds(6, 48, 185, 23); - panelImage.add(rdbtnImageEdit); - buttonGroup.add(rdbtnImageEdit); - rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageEdit.setBackground(SystemColor.menu); - - rdbtnImageDelete = new JRadioButton("L\u00F6schen"); - rdbtnImageDelete.setEnabled(false); - buttonGroup.add(rdbtnImageDelete); - rdbtnImageDelete - .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageDelete.setBackground(SystemColor.menu); - rdbtnImageDelete.setBounds(6, 74, 185, 23); - 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"); - rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageSearchDownload.setBackground(SystemColor.menu); - rdbtnImageSearchDownload.setBounds(6, 100, 185, 23); - panelImage.add(rdbtnImageSearchDownload); - - JPanel panelDesc = new JPanel(); - panelDesc.setLayout(null); - panelDesc.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Erklärung", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelDesc.setBackground(SystemColor.menu); - panelDesc.setBounds(290, 146, 270, 170); - contentPanel.add(panelDesc); - - ScrollPane scrollPaneDesc = new ScrollPane(); - scrollPaneDesc.setBounds(10, 15, 250, 145); - final JTextArea txtDesc = new JTextArea(); - txtDesc.setLineWrap(true); - txtDesc.setWrapStyleWord(true); - txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtDesc.setBackground(SystemColor.menu); - scrollPaneDesc.add(txtDesc); - // Pro AUswahl - txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."); - panelDesc.add(scrollPaneDesc); - - JPanel panelVeranstaltung = new JPanel(); - panelVeranstaltung.setLayout(null); - panelVeranstaltung.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelVeranstaltung.setBackground(SystemColor.menu); - panelVeranstaltung.setBounds(10, 327, 270, 170); - contentPanel.add(panelVeranstaltung); - - rdbtnVeranstaltungNew = new JRadioButton("Neu"); - buttonGroup.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew - .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23); - panelVeranstaltung.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew.setBackground(SystemColor.menu); - - rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten"); - rdbtnVeranstaltungEdit - .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 - .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 - .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungSearch.setBackground(SystemColor.menu); - rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungSearch); - - JLabel lblCrumbStart = new JLabel("Startseite"); - lblCrumbStart.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - Login_GUI lw = new Login_GUI(); - lw.setVisible(true); - MainMenue_GUI.this.setVisible(false); - } - }); - lblCrumbStart.setForeground(Color.BLUE); - lblCrumbStart.setBounds(10, 0, 52, 14); - contentPanel.add(lblCrumbStart); - - JLabel label = new JLabel(">"); - label.setBounds(60, 0, 13, 14); - contentPanel.add(label); - - JLabel lblRechtshinweis = new JLabel("Rechtshinweis"); - lblRechtshinweis.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - BillOfRights_GUI rb = new BillOfRights_GUI(); - rb.setVisible(true); - MainMenue_GUI.this.setVisible(false); - } - }); - lblRechtshinweis.setForeground(Color.BLUE); - lblRechtshinweis.setBounds(72, 0, 68, 14); - contentPanel.add(lblRechtshinweis); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(142, 0, 13, 14); - contentPanel.add(label_1); - - JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); - lblNewLabel_1.setBounds(150, 0, 74, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panelNews = new JPanel(); - panelNews.setLayout(null); - panelNews.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "News", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelNews.setBackground(SystemColor.menu); - panelNews.setBounds(290, 327, 270, 170); - contentPanel.add(panelNews); - - ScrollPane scrollPaneNews = new ScrollPane(); - // scrollPaneDesc.setBounds(10, 15, 250, 145); - scrollPaneNews.setBounds(10, 15, 250, 145); - JTextArea txtNews = new JTextArea(); - txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtNews.setBackground(SystemColor.menu); - txtNews.setWrapStyleWord(true); - txtNews.setLineWrap(true); - txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten, sind als HS-spezifisch :)"); - scrollPaneNews.add(txtNews); - panelNews.add(scrollPaneNews); - - /* - * Funktion Texte für das Klicken der RadioButtons - */ - rdbtnImageNew.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."; - txtDesc.setText(descNewImage); - } - }); - rdbtnImageEdit.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descEditImage = "Bearbeiten Sie die hinterlegten Informationen zu einem Image oder laden Sie eine neue .vmdk-Datei hoch."; - txtDesc.setText(descEditImage); - } - }); - rdbtnImageDelete.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese."; - txtDesc.setText(descDeleteImage); - } - }); - rdbtnImageSearchDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen."; - txtDesc.setText(descSearchImage); - } - }); - rdbtnVeranstaltungNew.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() { - public void actionPerformed(ActionEvent e) { - descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; - txtDesc.setText(descEditLecture); - } - }); - rdbtnVeranstaltungDelete.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; - } - }); - rdbtnVeranstaltungSearch.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); - } - }); - /* - * Ende der Radiobuttons - */ - - JLabel lblGrafik = new JLabel(""); - // ToolTipp für Grafik - lblGrafik - .setToolTipText("" - + "Ein virtuelles Labor besteht immer aus den beiden Komponenten
" - + "Image und Veranstaltung. Ein Image ist dabei die Grundlage f\u00FCr
" - + "mehrere Veranstaltungen. Somit kann eine neue Veranstaltung
" - + "erstellt werden, ohne ein neues Image hochladen zu m\u00FCssen.


" - + "Image: Das Image enth\u00E4lt die ben\u00F6tigte Software, die im
" - + "virtuellen Labor ben\u00F6tigt wird. Es wird von genau einem Dozenten
" - + "angelegt und besitzt einen allgemeinen Namen, z.B. \"Programmieren\".
" - + "Bei einem Image handelt es sich um eine Datei vom Typ VMDK.


" - + "Veranstaltung: Es k\u00F6nnen nun, basierend auf einem Image,
" - + " beliebig viele Veranstaltungen von unterschiedlichen Dozenten erstellt
" - + "werden. Diese k\u00F6nnten z.B. konkret \"Web-Entwicklung\" oder \"K\u00FCnstliche
" - + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" - + "\"Programmieren\"."); - lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/Image_zu_Veranstaltung_HDD.png"))); - // ToolTipp lange anzeigen - 60sec - ToolTipManager.sharedInstance().setDismissDelay(60000); - ToolTipManager.sharedInstance().registerComponent(lblGrafik); - lblGrafik.setBounds(82, 11, 391, 110); - contentPanel.add(lblGrafik); - - JTextPane txtpnUmDetaillierteInformationen = new JTextPane(); - txtpnUmDetaillierteInformationen - .setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik."); - txtpnUmDetaillierteInformationen.setEditable(false); - txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu); - txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22); - contentPanel.add(txtpnUmDetaillierteInformationen); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton continueButton = new JButton("Weiter"); - - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if (rdbtnImageNew.isSelected() == true) { - EingabeImageAllgemein_GUI sr = new EingabeImageAllgemein_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) { - SearchMethod_GUI sm = new SearchMethod_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) { - EingabeVeranstaltungAllgemein_GUI av = new EingabeVeranstaltungAllgemein_GUI(); - av.setVisible(true); - dispose(); - } else if (rdbtnVeranstaltungEdit.isSelected() == true) { - SearchEditLecture_GUI sl = new SearchEditLecture_GUI(); - sl.setVisible(true); - dispose(); - } - } - }); - continueButton.setActionCommand("OK"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(continueButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 91, 587, 2); - getContentPane().add(separator); - } - - 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); - - }// end main - -}// end class diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java deleted file mode 100644 index 53257f48..00000000 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ /dev/null @@ -1,459 +0,0 @@ -package 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.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.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.ListSelectionModel; -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 org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class SearchImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); - final TableRowSorter rowSorterAll = new TableRowSorter( - modelAll); - final TableRowSorter rowSorterMyImages = new TableRowSorter( - modelMyImages); - - /** - * 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. - */ - public SearchImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - // Beendet die Anwendung nach klick auf X - 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*"); - // 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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - 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)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - textFieldName.getText(), 0)); - - } - } - }); - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel( - "Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es = new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list = client.getAllOS(); - // Leeres Item hinzufügen - comboBox.addItem(""); - 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(); - } - // 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)); - } - } - - }); - 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ü - SearchImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("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); - } - - } - }); - - 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(); - 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); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages = new JTable(); - 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 Images", null, scrollPaneCoopImages, - null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - JButton btnDownload = new JButton("Download"); - 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); - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - 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); - } - } - - 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 images; - try { - // Hole eine Liste der Images - - images = client.getImageList(); - Iterator i = images.iterator(); - - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte für die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), - images.get(x).getLectureName(), - images.get(x).getUserData(), - images.get(x).getUpdateTime() }; - // Füge diese Objekte der Tabelle hinzu - 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/SearchMethod_GUI.java b/Dozentenmodul/src/GUI/SearchMethod_GUI.java deleted file mode 100644 index 24a12959..00000000 --- a/Dozentenmodul/src/GUI/SearchMethod_GUI.java +++ /dev/null @@ -1,243 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.ButtonGroup; -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.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -@SuppressWarnings("serial") -public class SearchMethod_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnNachEinemVlimage; - JRadioButton rdbtnNachEinerVeranstaltung; - private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchMethod_GUI dialog = new SearchMethod_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchMethod_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 603) / 2; - int left=(screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "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); - - 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.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.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); - - 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) { - - SearchMethod_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Suchmethode"); - lblNewLabel_1.setBounds(146, 11, 82, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if(rdbtnNachEinemVlimage.isSelected()==true) - { - SearchImage_GUI ea=new SearchImage_GUI(); - ea.setVisible(true); - dispose(); - } - } - - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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/VmWareLink_GUI.java b/Dozentenmodul/src/GUI/VmWareLink_GUI.java deleted file mode 100644 index 43df06a6..00000000 --- a/Dozentenmodul/src/GUI/VmWareLink_GUI.java +++ /dev/null @@ -1,215 +0,0 @@ -package gui; - -import java.awt.Desktop; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.JCheckBox; -import javax.swing.event.ChangeListener; -import javax.swing.event.ChangeEvent; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - - -@SuppressWarnings("serial") -public class VmWareLink_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JCheckBox chckbxNewCheckBox; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - VmWareLink_GUI dialog = new VmWareLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public VmWareLink_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBounds(0, 0, 577, 80); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hinweis VMWare Player"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); - } - - JTextPane txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 42); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 104, 567, 502); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JTextPane txtpnUmIhreVmdk = new JTextPane(); - txtpnUmIhreVmdk.setBackground(SystemColor.menu); - txtpnUmIhreVmdk.setEditable(false); - txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden."); - txtpnUmIhreVmdk.setBounds(10, 16, 499, 66); - contentPanel.add(txtpnUmIhreVmdk); - - JLabel lblNewLabel_1 = new JLabel("Windows: "); - lblNewLabel_1.addMouseListener(new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent arg0) { - URI url; - try { - url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"); - Desktop.getDesktop().browse(url); - } catch (URISyntaxException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - }); - - lblNewLabel_1.setBounds(10, 93, 499, 14); - contentPanel.add(lblNewLabel_1); - - chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen."); - chckbxNewCheckBox.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - if(chckbxNewCheckBox.isSelected()==true) - { - try { - Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - ini.put("main", "vmware",true); - ini.store(); - } catch (InvalidFileFormatException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - } - }); - chckbxNewCheckBox.setBounds(6, 472, 555, 23); - contentPanel.add(chckbxNewCheckBox); - - JLabel lbllinuxvmwarePlayer = new JLabel("Linux: "); - lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14); - contentPanel.add(lbllinuxvmwarePlayer); - - JLabel lblvmwarePlayerDownload = new JLabel("vmWare Player Download"); - lblvmwarePlayerDownload.setBounds(10, 118, 499, 14); - contentPanel.add(lblvmwarePlayerDownload); - - JLabel lblvmwarePlayerDownload_1 = new JLabel("vmWare Player Download"); - lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14); - contentPanel.add(lblvmwarePlayerDownload_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - MainMenue_GUI ea=new MainMenue_GUI(); - ea.setVisible(true); - dispose(); - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 91, 587, 2); - getContentPane().add(separator); - } - { - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - { - JMenu mnHilfe = new JMenu("Hilfe"); - menuBar.add(mnHilfe); - { - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnHilfe.add(mntmFaq); - } - { - JMenuItem mntmHilfe = new JMenuItem("Hilfe"); - mnHilfe.add(mntmHilfe); - } - } - } - - - - } -} diff --git a/Dozentenmodul/src/ftp/DownloadTask.java b/Dozentenmodul/src/ftp/DownloadTask.java index 8a643325..83ad2c15 100644 --- a/Dozentenmodul/src/ftp/DownloadTask.java +++ b/Dozentenmodul/src/ftp/DownloadTask.java @@ -1,6 +1,6 @@ package ftp; -import gui.FTPDownloader_GUI; +import gui.image.FTPDownloader_GUI; import java.io.File; import java.io.FileOutputStream; diff --git a/Dozentenmodul/src/gui/BillOfRights_GUI.java b/Dozentenmodul/src/gui/BillOfRights_GUI.java deleted file mode 100644 index a18ce291..00000000 --- a/Dozentenmodul/src/gui/BillOfRights_GUI.java +++ /dev/null @@ -1,192 +0,0 @@ -package gui; - -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.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -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.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - - - -@SuppressWarnings("serial") -public class BillOfRights_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JButton fwdButton; - JCheckBox chckbxAkzeptieren; - - /** - * Create the dialog. - */ - public BillOfRights_GUI() { - setResizable(false); - - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet das Programm beim Klick auf das X - System.exit(0); - } - }); - try { - //Setzt das Look & Feel auf das 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*"); - - //Zentiert das Fenster in der Bildschirmmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 567, 60); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hinweis"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); - } - - JTextPane txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 95, 567, 485); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JTextArea txtrLoremIpsumDolor = new JTextArea(); - txtrLoremIpsumDolor.setWrapStyleWord(true); - txtrLoremIpsumDolor.setLineWrap(true); - txtrLoremIpsumDolor.setEditable(false); - JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor); - scr.setBounds(0, 0, 567, 477); - txtrLoremIpsumDolor.setBounds(0, 0, 567, 477); - txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo"); - - contentPanel.add(scr); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - fwdButton = new JButton("Weiter"); - fwdButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - ini.put("main", "BillOfRights",true); - ini.store(); - } catch (InvalidFileFormatException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - VmWareLink_GUI ac=new VmWareLink_GUI(); - ac.setVisible(true); - dispose(); - } - }); - fwdButton.setEnabled(false); - - buttonPane.add(fwdButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 82, 587, 2); - getContentPane().add(separator); - } - - chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen."); - chckbxAkzeptieren.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - //Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht - if(chckbxAkzeptieren.isSelected()==true) - { - - fwdButton.setEnabled(true); - - } - else - { - - } - } - }); - chckbxAkzeptieren.setBackground(SystemColor.menu); - chckbxAkzeptieren.setBounds(10, 587, 567, 23); - getContentPane().add(chckbxAkzeptieren); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER); - 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/DeleteImage_GUI.java b/Dozentenmodul/src/gui/DeleteImage_GUI.java deleted file mode 100644 index 93859e33..00000000 --- a/Dozentenmodul/src/gui/DeleteImage_GUI.java +++ /dev/null @@ -1,439 +0,0 @@ -package 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.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.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 org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class DeleteImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); - final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); - final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - DeleteImage_GUI dialog = new DeleteImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public DeleteImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X - 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*"); - //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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - 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)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); - - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list=client.getAllOS(); - //Leeres Item hinzufügen - comboBox.addItem(""); - for(int i=0;i"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - - - } - else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); - //rowSorterMyImages.toggleSortOrder(0); - } - - } - }); - - 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); - initTableModel(modelAll); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable 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(); - - 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.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - - - - 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); - } - }); - btnDelete.setBounds(449, 508, 118, 23); - contentPanel.add(btnDelete); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton mainButton = new JButton("Hauptmen\u00FC"); - mainButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - mainButton.setActionCommand("Cancel"); - buttonPane.add(mainButton); - } - } - - 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 images; - try { - //Hole eine Liste der Images - - images = client.getImageList(); - Iterator i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; - //Füge diese Objekte der Tabelle hinzu - 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/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java deleted file mode 100644 index 1d30e9d0..00000000 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ /dev/null @@ -1,350 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Map; - -import javax.swing.JButton; -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.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -import org.apache.thrift.TException; - -import models.Image; -import models.person; -import server.Server.Client; -import thrift.ThriftConnection; -//import org.eclipse.wb.swing.FocusTraversalOnArray; -import java.awt.Component; - -@SuppressWarnings("serial") -public class EditImageAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField imagename; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - private JPanel panel_2; - private JLabel lblNewLabel; - private JTextPane txtpnBitteWhlenSie; - private JPanel buttonPane; - private JButton backButton; - private JButton okButton; - - /** - * Create the dialog. - */ - public EditImageAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei einem Klick auf das X - con.closeThriftConnection(); - System.exit(0); - } - }); - //Verhindert das vergrößern des Fensters - setResizable(false); - - try { - 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 der Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - initData(); - getContentPane().setLayout(null); - { - panel_2 = new JPanel(); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 11, 577, 57); - getContentPane().add(panel_2); - panel_2.setLayout(null); - { - lblNewLabel = new JLabel("Bearbeiten Ihrer Daten"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel_2.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); - } - - txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel_2.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 369); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 245, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEditable(false); - Vorname.setEnabled(false); - Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setColumns(10); - Vorname.setBounds(145, 245, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 276, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setColumns(10); - Nachname.setBounds(145, 276, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 307, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 307, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 338, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setBackground(Color.WHITE); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setColumns(10); - EMail.setBounds(145, 338, 350, 20); - panel_1.add(EMail); - - JLabel lblImagename = new JLabel("Imagename: *"); - lblImagename.setBackground(SystemColor.menu); - lblImagename.setBounds(10, 31, 125, 20); - panel_1.add(lblImagename); - - imagename = new JTextField(); - imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); - imagename.setBackground(Color.WHITE); - imagename.setText(Image.image.getImagename()); - imagename.setColumns(10); - imagename.setBounds(145, 31, 350, 20); - panel_1.add(imagename); - - JTextArea txtrGebenSieBitte = new JTextArea(); - txtrGebenSieBitte.setBackground(SystemColor.menu); - txtrGebenSieBitte.setLineWrap(true); - txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - txtrGebenSieBitte.setBounds(145, 62, 350, 110); - panel_1.add(txtrGebenSieBitte); - - 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(10, 442, 136, 14); - contentPanel.add(lblPflichtfelder); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar - con.closeThriftConnection(); - EditImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - 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("Bearbeiten"); - lblNewLabel_1.setBounds(146, 11, 71, 14); - contentPanel.add(lblNewLabel_1); - { - buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - //Image.image.setImagename(imagename.getText()); - con.closeThriftConnection(); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("CANCEL"); - buttonPane.add(backButton); - - } - { - okButton = new JButton("Weiter"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - System.out.println("text length="+imagename.getText().length()); - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - - //TODO - //Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht - //der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF??? - if(imagename.getText().length() <= 0){ - JOptionPane.showMessageDialog(null, - "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", - JOptionPane.WARNING_MESSAGE); - } else { - Image.image.setNewName(imagename.getText()); - con.closeThriftConnection(); - EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); - ea.setVisible(true); - dispose(); - }//end else - } - }); - - 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); - //setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs})); - - } - - public void initData(){ - try { - - Map map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); - if(map.get("internet").equals("0")){ - Image.image.setInternet(false); - } - else - { - Image.image.setInternet(true); - } - if(map.get("license").equals("0")){ - Image.image.setLicensed(false); - } - else{ - Image.image.setLicensed(true); - } - Image.image.setImagename(map.get("name")); - Image.image.setRam(Integer.parseInt(map.get("ram"))); - Image.image.setCpu(Integer.parseInt(map.get("cpu"))); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - -} diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java deleted file mode 100644 index 3c6109ae..00000000 --- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java +++ /dev/null @@ -1,366 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.ButtonGroup; -import javax.swing.JButton; -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.JSeparator; -import javax.swing.JSpinner; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.SpinnerNumberModel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -import models.Image; - -@SuppressWarnings("serial") -public class EditImageTechnisch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JSpinner spinnerCPU; - JSpinner spinnerRam; - JRadioButton rdbtnlicenseJa; - JRadioButton rdbtnlicenseNein; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - private final ButtonGroup buttonGrouplicense = new ButtonGroup(); - private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - - - /** - * Create the dialog. - */ - public EditImageTechnisch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei Klick auf das X - - System.exit(0); - } - - }); - //Verhindert das Vergrößern des Fensters - setResizable(false); - - try { - //setzt das Look & Feel - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Titel des Fensters - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 95); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - rdbtnlicenseJa = new JRadioButton("Ja"); - rdbtnlicenseJa.setSelected(true); - buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 29, 109, 23); - panel_1.add(rdbtnlicenseJa); - - rdbtnlicenseNein = new JRadioButton("Nein"); - buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 29, 109, 23); - panel_1.add(rdbtnlicenseNein); - if(Image.image.isLicensed()==true){ - rdbtnlicenseJa.setSelected(true); - } - else - { - rdbtnlicenseNein.setSelected(true); - } - - - - JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - rdbtnInternetJa = new JRadioButton("Ja"); - buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 57, 109, 23); - panel_1.add(rdbtnInternetJa); - - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 57, 109, 23); - panel_1.add(rdbtnInternetNein); - if(Image.image.isInternet()==true){ - rdbtnInternetJa.setSelected(true); - } - else - { - rdbtnInternetNein.setSelected(true); - } - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Macht dieses Fenster unsichtbar und das vorhergehende Fenster sichtbar - EditImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 172, 557, 338); - contentPanel.add(panel_2); - - JTextArea txtrHinweisSolltenSie = new JTextArea(); - txtrHinweisSolltenSie.setBackground(SystemColor.menu); - txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); - txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); - txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); - panel_2.add(txtrHinweisSolltenSie); - - JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); - lblNewLabel_3.setBounds(10, 91, 280, 20); - panel_2.add(lblNewLabel_3); - - JLabel lblMindestens = new JLabel("mindestens"); - lblMindestens.setBounds(315, 91, 60, 20); - panel_2.add(lblMindestens); - - spinnerRam = new JSpinner(); - spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); - spinnerRam.setBounds(385, 88, 29, 20); - spinnerRam.setValue(Image.image.getRam()); - panel_2.add(spinnerRam); - - JLabel lblGbyte = new JLabel("GByte"); - lblGbyte.setBounds(424, 91, 46, 20); - panel_2.add(lblGbyte); - - JTextArea txtrBeispielWindows = new JTextArea(); - txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); - txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows.setBackground(SystemColor.menu); - txtrBeispielWindows.setBounds(20, 111, 280, 55); - panel_2.add(txtrBeispielWindows); - - JTextArea txtrBeispielWindows_1 = new JTextArea(); - txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); - txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows_1.setBackground(SystemColor.menu); - txtrBeispielWindows_1.setBounds(20, 226, 280, 55); - panel_2.add(txtrBeispielWindows_1); - - JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); - lblWieVieleCpus.setBounds(10, 201, 280, 20); - panel_2.add(lblWieVieleCpus); - - JLabel label_3 = new JLabel("mindestens"); - label_3.setBounds(315, 201, 60, 20); - panel_2.add(label_3); - - spinnerCPU = new JSpinner(); - spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); - spinnerCPU.setBounds(385, 198, 29, 20); - spinnerCPU.setValue(Image.image.getCpu()); - panel_2.add(spinnerCPU); - - JLabel lblKerne = new JLabel("Kerne"); - lblKerne.setBounds(424, 201, 46, 20); - panel_2.add(lblKerne); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Setzt die Imagewerte in das Model - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - //Öffnet das vorherige Fenster - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - //Öffnet das nächste Fenster - FTPEditUploader_GUI ea=new FTPEditUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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); - - } - - - - } - diff --git a/Dozentenmodul/src/gui/EditLinkImage_GUI.java b/Dozentenmodul/src/gui/EditLinkImage_GUI.java deleted file mode 100644 index 8de896c3..00000000 --- a/Dozentenmodul/src/gui/EditLinkImage_GUI.java +++ /dev/null @@ -1,436 +0,0 @@ -package 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.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -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.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.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableModel; - -import models.Lecture; -import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class EditLinkImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - private JTextField textFieldName; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection thrift=new ThriftConnection(); - Client client=thrift.getThriftConnection(); - - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLinkImage_GUI dialog = new EditLinkImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EditLinkImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 603) / 2; - int left=(screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - - - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - - 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("Veanstaltung verlinken"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - textFieldName = new JTextField(); - textFieldName.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - String stext=textFieldName.getText(); - modelAll.setRowCount(0); - initTableModel(modelAll); - - if(stext!="") - for(int i=0;iErweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - List list=client.getAllOS(); - comboBox.addItem(""); - for(int i=0;i"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("Veranstaltung"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 76, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(151, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken"); - lblNewLabel_1.setBounds(164, 11, 113, 14); - contentPanel.add(lblNewLabel_1); - - JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); - - tabbedPane.setBounds(10, 197, 557, 300); - contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - JTable tablemyImages=new JTable(); - tablemyImages.setModel(model); - 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(); - - 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(); - - - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); - 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 Images", null, scrollPaneCoopImages, null); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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); - - JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable 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); - - JButton btnLinkLschen = new JButton("Link l\u00F6schen"); - btnLinkLschen.setBounds(478, 508, 89, 23); - contentPanel.add(btnLinkLschen); - - initTableModel(modelAll); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString(); - try { - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); - client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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); - - } - - public DefaultTableModel initTableModel(DefaultTableModel model){ - List images; - try { - images = client.getImageList(); - Iterator i=images.iterator(); - List ListObj = new ArrayList(); - int x=0; - - while(i.hasNext()) - { - - i.next(); - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()}; - ListObj.add(obj); - model.addRow(ListObj.get(x)); - x++; - - } - - return model; - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return model; - } - } - - diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java deleted file mode 100644 index c6be7580..00000000 --- a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java +++ /dev/null @@ -1,411 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -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.JSeparator; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -import models.Image; -import models.Lecture; -import models.person; -import javax.swing.JTextArea; -import java.awt.ScrollPane; -import com.toedter.calendar.JDateChooser; -import javax.swing.JRadioButton; -import javax.swing.ButtonGroup; - - -@SuppressWarnings("serial") -public class EditVeranstaltungAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField textFieldLaborname; - JTextArea description; - JRadioButton radioButtonyes; - JDateChooser dateChooserend; - JDateChooser dateChooserstart; - JRadioButton radioButtonno; - private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditVeranstaltungAllgemein_GUI dialog = new EditVeranstaltungAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EditVeranstaltungAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 21); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 331, 557, 162); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 33, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEditable(false); - Vorname.setEnabled(false); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setBackground(Color.WHITE); - Vorname.setColumns(10); - Vorname.setBounds(145, 33, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 64, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setBackground(Color.WHITE); - Nachname.setColumns(10); - Nachname.setBounds(145, 64, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 95, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setBackground(Color.WHITE); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 95, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 126, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setBackground(Color.WHITE); - EMail.setColumns(10); - EMail.setBounds(145, 126, 350, 20); - panel_1.add(EMail); - - 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) { - - EditVeranstaltungAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 36, 557, 284); - contentPanel.add(panel_2); - - JLabel label_3 = new JLabel("Laborname (Anzeigename): *"); - label_3.setBounds(10, 25, 180, 14); - panel_2.add(label_3); - - textFieldLaborname = new JTextField(); - textFieldLaborname.setText(Lecture.lecture.getName()); - textFieldLaborname.setColumns(10); - textFieldLaborname.setBounds(200, 22, 347, 20); - panel_2.add(textFieldLaborname); - - JTextArea textArea = new JTextArea(); - textArea.setWrapStyleWord(true); - textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - textArea.setLineWrap(true); - textArea.setFont(new Font("Tahoma", Font.PLAIN, 12)); - textArea.setBackground(SystemColor.menu); - textArea.setBounds(10, 49, 537, 49); - panel_2.add(textArea); - - JLabel label_4 = new JLabel("Beschreibung: *"); - label_4.setBounds(10, 111, 180, 14); - panel_2.add(label_4); - - ScrollPane scrollPane = new ScrollPane(); - scrollPane.setBounds(200, 104, 347, 78); - panel_2.add(scrollPane); - description = new JTextArea(); - description.setText(Lecture.lecture.getDesc()); - description.setLineWrap(true); - scrollPane.add(description); - description.setBounds(0, 0, 4, 22); - scrollPane.add(description); - - dateChooserend = new JDateChooser(); - dateChooserend.setDateFormatString("dd-MM-yyyy hh:mm:ss"); - dateChooserend.setDate(Lecture.lecture.getEnddate()); - dateChooserend.setBounds(385, 188, 100, 20); - panel_2.add(dateChooserend); - - JLabel label_5 = new JLabel("bis"); - label_5.setBounds(351, 188, 24, 20); - panel_2.add(label_5); - - dateChooserstart = new JDateChooser(); - dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); - dateChooserstart.setDate(Lecture.lecture.getStartdate()); - dateChooserstart.setBounds(240, 188, 101, 20); - panel_2.add(dateChooserstart); - - JLabel label_6 = new JLabel("von:"); - label_6.setBounds(200, 188, 30, 20); - panel_2.add(label_6); - - JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *"); - label_10.setBounds(10, 188, 250, 14); - panel_2.add(label_10); - - JLabel label_11 = new JLabel("Aktiv:"); - label_11.setBounds(10, 229, 250, 14); - panel_2.add(label_11); - - radioButtonyes = new JRadioButton("Ja"); - buttonGroup.add(radioButtonyes); - if(Lecture.lecture.isActive()==true) - { - radioButtonyes.setSelected(true); - }else - { - radioButtonno.setSelected(true); - } - - radioButtonyes.setBounds(240, 225, 109, 23); - panel_2.add(radioButtonyes); - - radioButtonno = new JRadioButton("Nein"); - buttonGroup.add(radioButtonno); - radioButtonno.setBounds(385, 225, 109, 23); - panel_2.add(radioButtonno); - - JLabel label_12 = new JLabel("(Im VMChooser sichtbar)"); - label_12.setBounds(10, 254, 250, 14); - panel_2.add(label_12); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if(radioButtonyes.isSelected()==true) - { - Lecture.lecture.setActive(true); - } - else - { - Lecture.lecture.setActive(false); - } - - Lecture.lecture.setName(textFieldLaborname.getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(textFieldLaborname.getText()); - - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if(radioButtonyes.isSelected()==true) - { - Lecture.lecture.setActive(true); - } - else - { - Lecture.lecture.setActive(false); - } - - Lecture.lecture.setName(textFieldLaborname.getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(textFieldLaborname.getText()); - - - LinkImage_GUI ev=new LinkImage_GUI(); - ev.setVisible(true); - dispose(); - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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); - - JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(32, 602, 136, 14); - getContentPane().add(lblPflichtfelder); - - 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); - - } - - -} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java deleted file mode 100644 index da4f6997..00000000 --- a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java +++ /dev/null @@ -1,302 +0,0 @@ -package gui; - - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import javax.swing.JTextField; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; - -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; - -import models.Image; -import models.person; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -@SuppressWarnings("serial") -public class EingabeImageAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField imagename; - - /** - * Create the dialog. - */ - public EingabeImageAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet das Fenster auf X - System.exit(0); - } - @Override - public void windowOpened(WindowEvent arg0) { - imagename.requestFocusInWindow(); - } - }); - //Verhindert das Vergrößern des Fensters - setResizable(false); - - try { - //setzt das Look & Feel - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Titel - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 369); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 245, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEnabled(false); - Vorname.setEditable(false); - Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setColumns(10); - Vorname.setBounds(145, 245, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 276, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setColumns(10); - Nachname.setBounds(145, 276, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 307, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 307, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 338, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setBackground(Color.WHITE); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setColumns(10); - EMail.setBounds(145, 338, 350, 20); - panel_1.add(EMail); - - JLabel lblImagename = new JLabel("Imagename: *"); - lblImagename.setBackground(SystemColor.menu); - lblImagename.setBounds(10, 31, 125, 20); - panel_1.add(lblImagename); - - - imagename = new JTextField(); - imagename.setBackground(Color.WHITE); - imagename.setText((String) null); - imagename.setColumns(10); - imagename.setBounds(145, 31, 350, 20); - imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurück kommt zur Seite - panel_1.add(imagename); - - JTextArea txtrGebenSieBitte = new JTextArea(); - txtrGebenSieBitte.setEditable(false); - txtrGebenSieBitte.setBackground(SystemColor.menu); - txtrGebenSieBitte.setLineWrap(true); - txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - txtrGebenSieBitte.setBounds(145, 62, 350, 110); - panel_1.add(txtrGebenSieBitte); - - 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(10, 442, 136, 14); - contentPanel.add(lblPflichtfelder); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauptmenü - EingabeImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - Image.image.setImagename(imagename.getText()); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("Cancel"); - buttonPane.add(backButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Prüft die Eingabe - if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) - { - //Schreibt die Daten in das Model - Image.image.setImagename(imagename.getText()); - EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI(); - ea.setVisible(true); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Error", JOptionPane.ERROR_MESSAGE); - } - } - }); - continueButton.setActionCommand("OK"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(continueButton); - } - } - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 78, 597, 2); - getContentPane().add(separator); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - getContentPane().add(separator_1); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - menuBar.add(mnNewMenu_1); - - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnNewMenu_1.add(mntmFaq); - - JMenuItem mntmOtrs = new JMenuItem("OTRS"); - mnNewMenu_1.add(mntmOtrs); - - }//end main -} diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java deleted file mode 100644 index 7c26ca23..00000000 --- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java +++ /dev/null @@ -1,364 +0,0 @@ -package gui; - - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import javax.swing.JRadioButton; -import javax.swing.ButtonGroup; -import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; - -import models.Image; - -@SuppressWarnings("serial") -public class EingabeImageTechnisch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JSpinner spinnerCPU; - JSpinner spinnerRam; - JRadioButton rdbtnlicenseJa; - JRadioButton rdbtnlicenseNein; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - private final ButtonGroup buttonGrouplicense = new ButtonGroup(); - private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EingabeImageTechnisch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 124); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - rdbtnlicenseNein = new JRadioButton("Nein"); - buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 29, 46, 23); - panel_1.add(rdbtnlicenseNein); - - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 57, 46, 23); - panel_1.add(rdbtnInternetNein); - - JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - JButton btnInternetSettings = new JButton("Einstellungen..."); - btnInternetSettings.setEnabled(false); - btnInternetSettings.setBounds(439, 57, 108, 23); - panel_1.add(btnInternetSettings); - - rdbtnInternetJa = new JRadioButton("Ja"); - - buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 57, 41, 23); - panel_1.add(rdbtnInternetJa); - - rdbtnlicenseJa = new JRadioButton("Ja"); - rdbtnlicenseJa.setSelected(true); - buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 29, 41, 23); - panel_1.add(rdbtnlicenseJa); - - JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:"); - lblLizenzserverEintragen.setBounds(10, 85, 250, 20); - panel_1.add(lblLizenzserverEintragen); - - JButton btnLicenseServer = new JButton("Server-Adresse..."); - btnLicenseServer.setEnabled(false); - btnLicenseServer.setBounds(266, 84, 157, 23); - panel_1.add(btnLicenseServer); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(11, 196, 557, 338); - contentPanel.add(panel_2); - - JLabel lblGbyte = new JLabel("GByte"); - lblGbyte.setBounds(424, 91, 46, 20); - panel_2.add(lblGbyte); - - spinnerCPU = new JSpinner(); - spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); - spinnerCPU.setBounds(385, 188, 29, 20); - panel_2.add(spinnerCPU); - - JTextArea txtrBeispielWindows = new JTextArea(); - txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); - txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows.setBackground(SystemColor.menu); - txtrBeispielWindows.setBounds(10, 122, 280, 55); - panel_2.add(txtrBeispielWindows); - - - - JLabel lblKerne = new JLabel("Kerne"); - lblKerne.setBounds(424, 191, 46, 20); - panel_2.add(lblKerne); - - JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); - lblWieVieleCpus.setBounds(10, 191, 280, 20); - panel_2.add(lblWieVieleCpus); - - spinnerRam = new JSpinner(); - spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); - spinnerRam.setBounds(385, 88, 29, 20); - panel_2.add(spinnerRam); - - JLabel label_3 = new JLabel("mindestens"); - label_3.setBounds(315, 191, 60, 20); - panel_2.add(label_3); - - JLabel lblMindestens = new JLabel("mindestens"); - lblMindestens.setBounds(315, 91, 60, 20); - panel_2.add(lblMindestens); - - JTextArea txtrBeispielWindows_1 = new JTextArea(); - txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); - txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows_1.setBackground(SystemColor.menu); - txtrBeispielWindows_1.setBounds(10, 222, 280, 55); - panel_2.add(txtrBeispielWindows_1); - - JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); - lblNewLabel_3.setBounds(10, 91, 280, 20); - panel_2.add(lblNewLabel_3); - - JTextArea txtrHinweisSolltenSie = new JTextArea(); - txtrHinweisSolltenSie.setBackground(SystemColor.menu); - txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); - txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); - txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); - panel_2.add(txtrHinweisSolltenSie); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - - EingabeImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.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) { - if(rdbtnInternetJa.isSelected()==true) - { - Image.image.setInternet(true); - } - else - { - Image.image.setInternet(false); - } - - if(rdbtnlicenseJa.isSelected()==true) - { - Image.image.setLicensed(true); - } - else - { - Image.image.setLicensed(false); - } - Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); - Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); - FTPUploader_GUI ea=new FTPUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(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/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java deleted file mode 100644 index 5b2d4751..00000000 --- a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java +++ /dev/null @@ -1,504 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -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.JSeparator; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import models.Image; -import models.Lecture; -import models.person; -import javax.swing.JTextArea; -import java.awt.ScrollPane; -import java.util.Calendar; -import java.util.Date; - -import com.toedter.calendar.JDateChooser; -import javax.swing.JRadioButton; - -@SuppressWarnings("serial") -public class EingabeVeranstaltungAllgemein_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField Vorname; - private JTextField Nachname; - private JTextField Hochschule; - private JTextField EMail; - private JTextField txtFldVeranstaltungsname; - JTextArea description; - JRadioButton radioButtonyes; - JRadioButton radioButtonno; - JDateChooser dateChooserend; - JDateChooser dateChooserstart; - Date startDate = new Date(); - Date endDate; - int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft - // aktiv sein darf - boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, - isAllInformationReady = false; - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EingabeVeranstaltungAllgemein_GUI dialog = new EingabeVeranstaltungAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public EingabeVeranstaltungAllgemein_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - - @Override - public void windowOpened(WindowEvent arg0) { - txtFldVeranstaltungsname.requestFocusInWindow(); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 21); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Informationen zum Besitzer", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 331, 557, 162); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel label = new JLabel("Vorname: *"); - label.setBackground(SystemColor.menu); - label.setBounds(10, 33, 125, 20); - panel_1.add(label); - - Vorname = new JTextField(); - Vorname.setEditable(false); - Vorname.setEnabled(false); - Vorname.setText(person.verantwortlicher.getVorname()); - Vorname.setBackground(Color.WHITE); - Vorname.setColumns(10); - Vorname.setBounds(145, 33, 350, 20); - panel_1.add(Vorname); - - JLabel label_7 = new JLabel("Nachname: *"); - label_7.setBackground(SystemColor.menu); - label_7.setBounds(10, 64, 125, 20); - panel_1.add(label_7); - - Nachname = new JTextField(); - Nachname.setEnabled(false); - Nachname.setEditable(false); - Nachname.setText(person.verantwortlicher.getName()); - Nachname.setBackground(Color.WHITE); - Nachname.setColumns(10); - Nachname.setBounds(145, 64, 350, 20); - panel_1.add(Nachname); - - JLabel label_8 = new JLabel("Hochschule: *"); - label_8.setBackground(SystemColor.menu); - label_8.setBounds(10, 95, 125, 20); - panel_1.add(label_8); - - Hochschule = new JTextField(); - Hochschule.setEnabled(false); - Hochschule.setEditable(false); - Hochschule.setText(person.verantwortlicher.getHochschule()); - Hochschule.setBackground(Color.WHITE); - Hochschule.setColumns(10); - Hochschule.setBounds(145, 95, 350, 20); - panel_1.add(Hochschule); - - JLabel label_9 = new JLabel("E-Mail: *"); - label_9.setBackground(SystemColor.menu); - label_9.setBounds(10, 126, 125, 20); - panel_1.add(label_9); - - EMail = new JTextField(); - EMail.setEnabled(false); - EMail.setEditable(false); - EMail.setText(person.verantwortlicher.getEMail()); - EMail.setBackground(Color.WHITE); - EMail.setColumns(10); - EMail.setBounds(145, 126, 350, 20); - panel_1.add(EMail); - - 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) { - - EingabeVeranstaltungAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 36, 557, 284); - contentPanel.add(panel_2); - - JLabel label_3 = new JLabel("Laborname (Anzeigename): *"); - label_3.setBounds(10, 25, 180, 14); - panel_2.add(label_3); - - txtFldVeranstaltungsname = new JTextField(); - txtFldVeranstaltungsname.setColumns(10); - txtFldVeranstaltungsname.setBounds(200, 22, 347, 20); - txtFldVeranstaltungsname.setText(Lecture.lecture.getName()); - panel_2.add(txtFldVeranstaltungsname); - - JTextArea textArea = new JTextArea(); - textArea.setEditable(false); - textArea.setWrapStyleWord(true); - textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); - textArea.setLineWrap(true); - textArea.setFont(new Font("Tahoma", Font.PLAIN, 12)); - textArea.setBackground(SystemColor.menu); - textArea.setBounds(10, 49, 537, 49); - panel_2.add(textArea); - - JLabel lblDesc = new JLabel("Beschreibung: *"); - lblDesc.setBounds(10, 111, 180, 14); - panel_2.add(lblDesc); - - ScrollPane scrollPane = new ScrollPane(); - scrollPane.setBounds(200, 104, 347, 78); - panel_2.add(scrollPane); - description = new JTextArea(); - description.setFont(new Font("Tahoma", Font.PLAIN, 11)); - description.setLineWrap(true); - description.setText(Lecture.lecture.getDesc()); - scrollPane.add(description); - description.setBounds(0, 0, 4, 22); - scrollPane.add(description); - - dateChooserend = new JDateChooser(); - endDate = addDays(new Date(), maxLifeTime); // Datum darf weiter als 6 - // Monate in der Zukunft - // liegen - dateChooserend.setDate(endDate); - if (Lecture.lecture.getEnddate() == null) { - // is not defined yet - dateChooserend.setDate(endDate); - } else { - // already defined from last visit on this page - dateChooserend.setDate(Lecture.lecture.getEnddate()); - } - dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss"); - dateChooserend.setBounds(404, 188, 143, 20); - panel_2.add(dateChooserend); - - JLabel lblBis = new JLabel("bis:"); - lblBis.setBounds(378, 188, 21, 20); - panel_2.add(lblBis); - - dateChooserstart = new JDateChooser(); - if (Lecture.lecture.getStartdate() == null) { - // is not defined yet - dateChooserstart.setDate(startDate); - } else { - // already defined from last visit on this page - dateChooserstart.setDate(Lecture.lecture.getStartdate()); - } - dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); - dateChooserstart.setBounds(226, 188, 143, 20); - panel_2.add(dateChooserstart); - - JLabel label_6 = new JLabel("von:"); - label_6.setBounds(200, 188, 30, 20); - panel_2.add(label_6); - - JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *"); - label_10.setBounds(10, 194, 127, 14); - panel_2.add(label_10); - - JLabel label_11 = new JLabel("Aktiv:"); - label_11.setBounds(10, 229, 127, 14); - panel_2.add(label_11); - - radioButtonyes = new JRadioButton("Ja"); - radioButtonyes.setSelected(true); - radioButtonyes.setBounds(200, 225, 73, 23); - panel_2.add(radioButtonyes); - - radioButtonno = new JRadioButton("Nein"); - radioButtonyes.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - radioButtonyes.setSelected(true); - radioButtonno.setSelected(false); - } - }); - radioButtonno.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - radioButtonno.setSelected(true); - radioButtonyes.setSelected(false); - } - }); - radioButtonno.setBounds(296, 225, 73, 23); - panel_2.add(radioButtonno); - - JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)"); - lblimVmchooserSichtbar.setBounds(10, 245, 127, 14); - panel_2.add(lblimVmchooserSichtbar); - - JLabel lblmaxMonate = new JLabel("(max. 6 Monate)"); - lblmaxMonate.setBounds(10, 208, 127, 14); - panel_2.add(lblmaxMonate); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton backButton = new JButton("Zur\u00FCck"); - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if (radioButtonyes.isSelected() == true) { - Lecture.lecture.setActive(true); - } else { - Lecture.lecture.setActive(false); - } - - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart.getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); - - MainMenue_GUI sr = new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - backButton.setActionCommand("Cancel"); - buttonPane.add(backButton); - getRootPane().setDefaultButton(backButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - // liegt das End-Datum vor dem Start-Datum? - if (dateChooserend.getDate().before( - dateChooserstart.getDate())) { - // datum ist falsch rum - isDateOrderCorrect = false; - JOptionPane - .showMessageDialog( - null, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", - "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // bereit - isDateOrderCorrect = true; - } - // liegt das eingegebene Datum nach dem erlaubten - // End-Datum? - if (dateChooserend.getDate().after(endDate)) { - // Datum zu weit weg - isDateMaxLifeTimeCorrect = false; - JOptionPane.showMessageDialog(null, - "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" - + endDate, "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // bereit - isDateMaxLifeTimeCorrect = true; - } - // Prüfen ob alles eingegeben wurde - if (txtFldVeranstaltungsname.getText().isEmpty() == true - || description.getText().isEmpty() == true) { - // mind 1 Textfeld ist leer - isAllInformationReady = false; - JOptionPane - .showMessageDialog( - null, - "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", - "Datum fehlerhaft", - JOptionPane.ERROR_MESSAGE); - } else { - // Textfelder bereit - isAllInformationReady = true; - } - - // welcher Radiobutton ist geklickt? - if (radioButtonyes.isSelected() == true) { - Lecture.lecture.setActive(true); - } else { - Lecture.lecture.setActive(false); - } - // Prüfe ob alle Eingaben korrekt sind, dann mache - // weiter - if (isAllInformationReady == true - && isDateMaxLifeTimeCorrect == true - && isDateOrderCorrect == true) { - // everything is ok, proceed - Lecture.lecture.setName(txtFldVeranstaltungsname - .getText()); - Lecture.lecture.setDesc(description.getText()); - Lecture.lecture.setEnddate(dateChooserend.getDate()); - Lecture.lecture.setStartdate(dateChooserstart - .getDate()); - Image.image.setImagename(txtFldVeranstaltungsname - .getText()); - - LinkImage_GUI ev = new LinkImage_GUI(); - ev.setVisible(true); - dispose(); - } - - } - }); - 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); - - JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); - lblPflichtfelder.setBounds(32, 602, 136, 14); - getContentPane().add(lblPflichtfelder); - - 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); - - } - - public Date addDays(Date date, int days) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.DATE, days); // minus number would decrement the days - return cal.getTime(); - } -} diff --git a/Dozentenmodul/src/gui/ExtendedSearch_GUI.java b/Dozentenmodul/src/gui/ExtendedSearch_GUI.java deleted file mode 100644 index 7f042cae..00000000 --- a/Dozentenmodul/src/gui/ExtendedSearch_GUI.java +++ /dev/null @@ -1,234 +0,0 @@ -package gui; - - -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.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -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.JPanel; -import javax.swing.JSeparator; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -@SuppressWarnings("serial") -public class ExtendedSearch_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - private JTextField textField; - private JTextField textField_1; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - ExtendedSearch_GUI dialog = new ExtendedSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public ExtendedSearch_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width -603) / 2; - setBounds(left, top, 603, 722); - - 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("Weitere Suchoptionen"); - 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("beschreibung"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 11, 557, 95); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Image-Typ"); - lblNewLabel_2.setBounds(10, 39, 176, 20); - panel_1.add(lblNewLabel_2); - - JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image"); - chckbxBestehendesImage.setSelected(true); - chckbxBestehendesImage.setBounds(192, 38, 138, 23); - panel_1.add(chckbxBestehendesImage); - - JCheckBox chckbxRohling = new JCheckBox("Rohling"); - chckbxRohling.setSelected(true); - chckbxRohling.setBounds(332, 38, 97, 23); - panel_1.add(chckbxRohling); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 117, 557, 95); - contentPanel.add(panel); - - JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software"); - lblEnthalteneSoftware.setBounds(10, 39, 176, 20); - panel.add(lblEnthalteneSoftware); - - textField = new JTextField(); - textField.setBounds(196, 39, 351, 20); - panel.add(textField); - textField.setColumns(10); - - JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben"); - lblNewLabel_1.setBounds(196, 70, 351, 14); - panel.add(lblNewLabel_1); - - JPanel panel_2 = new JPanel(); - panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 223, 557, 123); - contentPanel.add(panel_2); - - JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers"); - lblNachnameDesErstellers.setBounds(10, 39, 176, 20); - panel_2.add(lblNachnameDesErstellers); - - textField_1 = new JTextField(); - textField_1.setColumns(10); - textField_1.setBounds(196, 39, 351, 20); - panel_2.add(textField_1); - - JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t"); - lblHochschuleuniversitt.setBounds(10, 70, 176, 20); - panel_2.add(lblHochschuleuniversitt); - - JComboBox comboBox = new JComboBox(); - comboBox.setBounds(196, 70, 351, 20); - panel_2.add(comboBox); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - - EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("\u00DCbernehmen"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - - FTPUploader_GUI ea=new FTPUploader_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java deleted file mode 100644 index cb53fc3d..00000000 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ /dev/null @@ -1,370 +0,0 @@ -package gui; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import java.io.File; - -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; - -import ftp.DownloadTask; - -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.SystemColor; -import java.awt.Font; -import javax.swing.JTextPane; -import javax.swing.JSeparator; - -import models.Image; - -import org.apache.thrift.TException; - -import server.Server.Client; -import server.User; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { - - @SuppressWarnings("unused") - private JPanel contentPane; - private final JPanel contentPanel = new JPanel(); - JLabel lblNewLabel; - JLabel downspeed; - User user; - JProgressBar progressBar; - String host = "141.79.128.121"; - int port = 21; - String username = "openslx"; - String password = "openslx-ng"; - String downloadFile = ""; - static String arg = ""; - DownloadTask task; - JLabel bytesreadlbl; - JLabel lblNewLabel_3; - JLabel labelVerbleibend; - long filesize; - double speed; - long bytesread; - JLabel labelZeit; - boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); - JButton buttonback = new JButton("Zur\u00FCck"); - - /** - * Launch the application. - */ - /* - * public static void main(String[] args) { EventQueue.invokeLater(new - * Runnable() { public void run() { try { FTPDownloader frame = new - * FTPDownloader(); frame.setVisible(true); } catch (Exception e) { - * e.printStackTrace(); } } }); } - */ - - /** - * Create the frame. - */ - public FTPDownloader_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - if (taskrun == true) { - try { - client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - dispose(); - } - }); - setResizable(false); - // setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - - - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - contentPanel.setLayout(null); - { - JButton btnSpeicherortAuswhlen = new JButton( - "Speicherort ausw\u00E4hlen"); - btnSpeicherortAuswhlen.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - - fc.showOpenDialog(getParent()); - File dir = fc.getSelectedFile(); - lblNewLabel.setText(dir.getAbsolutePath()); - } - }); - - btnSpeicherortAuswhlen.setBounds(57, 124, 141, 23); - btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); - contentPanel.add(btnSpeicherortAuswhlen); - } - - lblNewLabel = new JLabel("C:\\"); - lblNewLabel.setBounds(208, 124, 238, 23); - contentPanel.add(lblNewLabel); - - JButton btnDownloadStarten = new JButton("Download starten"); - btnDownloadStarten.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - buttonDownloadActionPerformed(arg0); - } - }); - - btnDownloadStarten.setBounds(57, 168, 141, 23); - contentPanel.add(btnDownloadStarten); - - progressBar = new JProgressBar(0, 100); - progressBar.setStringPainted(true); - - progressBar.setBounds(57, 202, 497, 30); - contentPanel.add(progressBar); - - JLabel lblDownloadgeschwindigkeit = new JLabel( - "Downloadgeschwindigkeit:"); - lblDownloadgeschwindigkeit.setBounds(57, 243, 141, 14); - contentPanel.add(lblDownloadgeschwindigkeit); - - downspeed = new JLabel("0"); - downspeed.setBounds(308, 243, 95, 14); - contentPanel.add(downspeed); - - JLabel lblNewLabel_1 = new JLabel("Fertig:"); - lblNewLabel_1.setBounds(57, 293, 46, 14); - contentPanel.add(lblNewLabel_1); - - bytesreadlbl = new JLabel(""); - bytesreadlbl.setBounds(66, 244, 108, 14); - contentPanel.add(bytesreadlbl); - - JLabel lblNewLabel_2 = new JLabel("von:"); - lblNewLabel_2.setBounds(226, 293, 46, 14); - contentPanel.add(lblNewLabel_2); - - lblNewLabel_3 = new JLabel(""); - lblNewLabel_3.setBounds(235, 244, 108, 14); - contentPanel.add(lblNewLabel_3); - - JLabel lblMbVerbleibend = new JLabel("Verbleibend:"); - lblMbVerbleibend.setBounds(57, 318, 71, 14); - contentPanel.add(lblMbVerbleibend); - - labelVerbleibend = new JLabel(""); - labelVerbleibend.setBounds(91, 269, 108, 14); - contentPanel.add(labelVerbleibend); - - JLabel lblGeschtzteVerbleibendeZeit = new JLabel( - "Gesch\u00E4tzte Verbleibende Zeit:"); - lblGeschtzteVerbleibendeZeit.setBounds(57, 268, 150, 14); - contentPanel.add(lblGeschtzteVerbleibendeZeit); - - labelZeit = new JLabel(""); - labelZeit.setBounds(261, 219, 117, 14); - contentPanel.add(labelZeit); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBackground(SystemColor.menu); - 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); - - 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); - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); - contentPanel.add(separator); - - JLabel label_1 = new JLabel("Hauptmen\u00FC"); - label_1.setForeground(Color.BLUE); - label_1.setBounds(20, 88, 61, 20); - contentPanel.add(label_1); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(80, 91, 14, 14); - contentPanel.add(label_2); - - JLabel label_3 = new JLabel("VL-Image"); - label_3.setForeground(Color.BLUE); - label_3.setBounds(91, 88, 46, 20); - contentPanel.add(label_3); - - JLabel label_4 = new JLabel(">"); - label_4.setBounds(139, 91, 14, 14); - contentPanel.add(label_4); - - JLabel label_5 = new JLabel("Neu/Bearbeiten"); - label_5.setBounds(149, 91, 108, 14); - contentPanel.add(label_5); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(-10, 648, 597, 2); - contentPanel.add(separator_1); - - JLabel label_6 = new JLabel("1."); - label_6.setBounds(24, 128, 23, 14); - contentPanel.add(label_6); - - JLabel label_7 = new JLabel("2."); - label_7.setBounds(24, 172, 23, 14); - contentPanel.add(label_7); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBackground(UIManager.getColor("Button.background")); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - buttonback.setEnabled(false); - buttonback.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if (taskrun == true) { - task.cancel(true); - try { - client.DeleteFtpUser(user.userName); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - thrift.closeThriftConnection(); - SearchEditImage_GUI se=new SearchEditImage_GUI(); - se.setVisible(true); - dispose(); - } - }); - buttonback.setActionCommand("Cancel"); - buttonPane.add(buttonback); - } - } - setVisible(true); - - } - - private void buttonDownloadActionPerformed(ActionEvent event) { - - progressBar.setValue(0); - - try { - user = client.getFtpUser(); - - downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); - - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - task = new DownloadTask(host, port, user.userName, user.password, - downloadFile, lblNewLabel.getText(), this); - task.addPropertyChangeListener(this); - task.execute(); - taskrun = true; - - } - - public void propertyChange(PropertyChangeEvent arg0) { - - int progress = 0; - if ("progress" == arg0.getPropertyName()) { - progress = (Integer) arg0.getNewValue(); - progressBar.setValue(progress); - if (progress == 100) { - buttonback.setEnabled(true); - } - } - - if ("speed" == arg0.getPropertyName()) { - speed = (double) arg0.getNewValue(); - // if(speed<=1){ - - downspeed.setText(String.valueOf(speed).substring(0, - String.valueOf(speed).lastIndexOf(".") + 3) - + " MB/s"); - - // }else - // { - // double MBSpeed=speed/1024; - // downspeed.setText(String.valueOf((MBSpeed)).substring(0, - // String.valueOf(MBSpeed).indexOf("."))); - // } - - } - if ("bytesread" == arg0.getPropertyName()) { - bytesread = (long) arg0.getNewValue(); - bytesreadlbl.setText((bytesread / 1024 / 1024) + " MB"); - labelVerbleibend - .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) - + " MB"); - - labelZeit - .setText(String - .valueOf( - ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) - .substring( - 0, - String.valueOf( - (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) - .lastIndexOf(".")) - + " Minuten"); - - } - if ("filesize" == arg0.getPropertyName()) { - filesize = (long) arg0.getNewValue(); - lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB"); - - } - - } -} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java deleted file mode 100644 index e7252898..00000000 --- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java +++ /dev/null @@ -1,427 +0,0 @@ -package gui; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.EventQueue; -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.WindowAdapter; -import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.JSeparator; -import javax.swing.JTextPane; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import models.Image; -import models.person; -//import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; -import ftp.UploadTask; - - -@SuppressWarnings("serial") -public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListener { - - @SuppressWarnings("unused") - private JPanel contentPane; - private final JPanel contentPanel = new JPanel(); - JLabel lblNewLabel; - JProgressBar progressBar; - String host="141.79.128.121"; - int port=21; - server.User user; - String filename=""; - File uploadFile; - static String arg=""; - UploadTask task; - JLabel UpSpeed; - JLabel labelfertig; - JLabel labelfilesize; - JLabel labelZeit; - JLabel labelverbleibend; - long filesize; - double speed; - long bytesread; - boolean taskrun=false; - ThriftConnection thrift=new ThriftConnection(); - Client client=thrift.getThriftConnection(); - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPEditUploader_GUI frame = new FTPEditUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the frame. - */ - public FTPEditUploader_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - if(taskrun==true) - { - try { - - client.DeleteFtpUser(user.userName); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - } - }); - setResizable(false); - //setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - - - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - //filename=name; - setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 250); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - contentPanel.setLayout(null); - { - JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen"); - btnSpeicherortAuswhlen.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - JFileChooser fc=new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.FILES_ONLY); - - fc.showOpenDialog(getParent()); - File dir=fc.getSelectedFile(); - uploadFile=dir; - filename=uploadFile.getName(); - lblNewLabel.setText(dir.getAbsolutePath()); - } - }); - - btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23); - btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); - contentPanel.add(btnSpeicherortAuswhlen); - } - - lblNewLabel = new JLabel(""); - lblNewLabel.setBounds(184, 124, 255, 23); - contentPanel.add(lblNewLabel); - - JButton btnDownloadStarten = new JButton("Upload starten"); - btnDownloadStarten.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - buttonUploadActionPerformed(arg0); - - } - }); - - btnDownloadStarten.setBounds(10, 330, 141, 23); - contentPanel.add(btnDownloadStarten); - - progressBar = new JProgressBar(0,100); - progressBar.setStringPainted(true); - - - progressBar.setBounds(10, 158, 577, 30); - contentPanel.add(progressBar); - - JLabel label = new JLabel("Downloadgeschwindigkeit:"); - label.setBounds(10, 199, 141, 14); - contentPanel.add(label); - - JLabel label_1 = new JLabel("Fertig:"); - label_1.setBounds(10, 249, 46, 14); - contentPanel.add(label_1); - - labelfertig = new JLabel("0"); - labelfertig.setBounds(66, 249, 108, 14); - contentPanel.add(labelfertig); - - UpSpeed = new JLabel("0"); - UpSpeed.setBounds(329, 199, 95, 14); - contentPanel.add(UpSpeed); - - JLabel label_4 = new JLabel("von:"); - label_4.setBounds(184, 249, 46, 14); - contentPanel.add(label_4); - - labelfilesize = new JLabel("0"); - labelfilesize.setBounds(240, 249, 108, 14); - contentPanel.add(labelfilesize); - - JLabel label_6 = new JLabel("Verbleibend:"); - label_6.setBounds(10, 274, 71, 14); - contentPanel.add(label_6); - - JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); - label_7.setBounds(10, 224, 150, 14); - contentPanel.add(label_7); - - labelZeit = new JLabel("0"); - labelZeit.setBounds(329, 224, 117, 14); - contentPanel.add(labelZeit); - - labelverbleibend = new JLabel("0"); - labelverbleibend.setBounds(91, 274, 108, 14); - contentPanel.add(labelverbleibend); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); - contentPanel.add(panel); - - JLabel label_2 = new JLabel("Eingabe Ihrer Daten"); - label_2.setFont(new Font("Tahoma", Font.BOLD, 18)); - label_2.setBounds(10, 11, 509, 22); - panel.add(label_2); - - 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); - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); - contentPanel.add(separator); - - JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); - lblNewLabel_1.setForeground(Color.BLUE); - lblNewLabel_1.setBounds(20, 88, 61, 20); - contentPanel.add(lblNewLabel_1); - - JLabel label_3 = new JLabel(">"); - label_3.setBounds(80, 91, 14, 14); - contentPanel.add(label_3); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(91, 88, 46, 20); - contentPanel.add(lblVlimage); - - JLabel label_5 = new JLabel(">"); - label_5.setBounds(139, 91, 14, 14); - contentPanel.add(label_5); - - JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten"); - lblNeubearbeiten.setBounds(149, 91, 108, 14); - contentPanel.add(lblNeubearbeiten); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - contentPanel.add(separator_1); - - JButton btnCopyFileTo = new JButton("Copy File to Prod"); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - client.startFileCopy(user.path+"/"+uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - btnCopyFileTo.setBounds(10, 375, 264, 23); - contentPanel.add(btnCopyFileTo); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBackground(UIManager.getColor("Button.background")); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - JButton ButtonReady = new JButton("Abschlie\u00DFen"); - ButtonReady.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - updateData(); - dispose(); - MainMenue_GUI m=new MainMenue_GUI(); - m.setVisible(true); - - if(taskrun==true) - { - try { - client.DeleteFtpUser(user.userName); - - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - thrift.closeThriftConnection(); - } - }); - - JButton buttonCancel = new JButton("Schlie\u00DFen"); - buttonCancel.setActionCommand("Cancel"); - buttonPane.add(buttonCancel); - ButtonReady.setActionCommand("Cancel"); - buttonPane.add(ButtonReady); - } - } - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); - setVisible(true); - - } - - private void buttonUploadActionPerformed(ActionEvent event) { - // File (or directory) with old name - // File file = new File(lblNewLabel.getText()); - - // File (or directory) with new name - //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk"); - //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk"); - - - // Rename file (or directory) - //boolean success = file.renameTo(file2); - //if (!success) { - // File was not successfully renamed - //System.out.println("Not OK"); - //} - //else - //{ - //System.out.println("OK"); - //} - progressBar.setValue(0); - - try { - user=client.getFtpUser(); - System.out.println("name"+user.userName); - System.out.println("path"+user.path); - System.out.println("pass"+user.password); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); - Image.image.setNewName(formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); - task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); - - task.addPropertyChangeListener(this); - task.execute(); - taskrun=true; - - //createXML(); - //TransferToSatellit(); - - - } - - public void propertyChange(PropertyChangeEvent arg0) { - if ("progress" == arg0.getPropertyName()) { - int progress = (Integer) arg0.getNewValue(); - progressBar.setValue(progress); - } - if("speed"==arg0.getPropertyName()){ - speed=(double)arg0.getNewValue(); - //if(speed<=1){ - - UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s"); - - // }else - //{ - //double MBSpeed=speed/1024; - //downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf("."))); - //} - - } - if("bytesread"==arg0.getPropertyName()) - { - bytesread=(long)arg0.getNewValue(); - labelfertig.setText((bytesread/1024/1024)+" MB"); - labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB"); - - - labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten"); - - - } - if("filesize"==arg0.getPropertyName()) - { - filesize=(long)arg0.getNewValue(); - labelfilesize.setText((filesize/1024/1024)+" MB"); - - } - - } - - public boolean updateData(){ - - try { - - - System.out.println("Start Update"); - client.updateImageData(Image.image.getImagename(),Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(),Image.image.getImageId(),Image.image.getVersion()); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - return false; - } - return true; - - - } -} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java deleted file mode 100644 index 3dd6a906..00000000 --- a/Dozentenmodul/src/gui/FTPUploader_GUI.java +++ /dev/null @@ -1,482 +0,0 @@ -package gui; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.EventQueue; -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.WindowAdapter; -import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.File; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import javax.swing.JButton; -import javax.swing.JFileChooser; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.JSeparator; -import javax.swing.JTextPane; -import javax.swing.SwingConstants; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import models.Image; -import models.person; -import org.apache.thrift.TException; -import server.Server.Client; -import thrift.ThriftConnection; -//import util.XMLCreator; -import ftp.UploadTask; - -@SuppressWarnings("serial") -public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - - @SuppressWarnings("unused") - private JPanel contentPane; - private final JPanel contentPanel = new JPanel(); - JLabel lblNewLabel; - JProgressBar progressBar; - String host = "141.79.128.121"; - int port = 21; - server.User user; - String filename = ""; - File uploadFile; - static String arg = ""; - UploadTask task; - JLabel UpSpeed; - JLabel labelfertig; - JLabel labelfilesize; - JLabel labelZeit; - JLabel labelverbleibend; - long filesize; - double speed; - long bytesread; - boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); - JButton finishButton = new JButton("Fertigstellen"); - JButton btnUploadStarten = new JButton("Upload auf Server starten"); - JButton btnZurck = new JButton("Zur\u00FCck"); - int progress = 0; // progress of upload - - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPUploader_GUI frame = new FTPUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the frame. - */ - public FTPUploader_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - if (taskrun == true) { - try { - - client.DeleteFtpUser(user.userName); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - // filename=name; - setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 250); - getContentPane().setLayout(new BorderLayout()); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel, BorderLayout.CENTER); - contentPanel.setLayout(null); - { - JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); - btnSpeicherortAuswhlen.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - JFileChooser fc = new JFileChooser(); - fc.setFileSelectionMode(JFileChooser.FILES_ONLY); - - fc.showOpenDialog(getParent()); - File file = fc.getSelectedFile(); - // check if a file is selected and exists - if (file != null) { - System.out.println("File to upload exists"); - uploadFile = file; - filename = uploadFile.getName(); - lblNewLabel.setText(file.getAbsolutePath()); - } else { - System.out.println("No file selected"); - lblNewLabel.setText(""); - }// end if - } - }); - - btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23); - btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - contentPanel.add(btnSpeicherortAuswhlen); - } - - lblNewLabel = new JLabel(""); - lblNewLabel.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent arg0) { - if (lblNewLabel.getText().isEmpty()) { - // wenn leer, dann upload button nicht freigeben - btnUploadStarten.setEnabled(false); - } else { - // wenn leer, dann upload button nicht freigeben - btnUploadStarten.setEnabled(true); - } - } - }); - lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); - lblNewLabel.setBounds(285, 124, 302, 23); - contentPanel.add(lblNewLabel); - - btnUploadStarten.setEnabled(false); - btnUploadStarten.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - buttonUploadActionPerformed(arg0); - - } - }); - - btnUploadStarten.setBounds(102, 168, 173, 23); - contentPanel.add(btnUploadStarten); - - progressBar = new JProgressBar(0, 100); - progressBar.setStringPainted(true); - - progressBar.setBounds(102, 202, 485, 30); - contentPanel.add(progressBar); - - JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:"); - lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14); - contentPanel.add(lblUploadgeschwindigkeit); - - JLabel label_1 = new JLabel("Fertig:"); - label_1.setBounds(102, 293, 46, 14); - contentPanel.add(label_1); - - labelfertig = new JLabel("0"); - labelfertig.setHorizontalAlignment(SwingConstants.LEFT); - labelfertig.setBounds(183, 293, 108, 14); - contentPanel.add(labelfertig); - - UpSpeed = new JLabel("0"); - UpSpeed.setHorizontalAlignment(SwingConstants.LEFT); - UpSpeed.setBounds(374, 243, 117, 14); - contentPanel.add(UpSpeed); - - JLabel label_4 = new JLabel("von:"); - label_4.setBounds(318, 293, 46, 14); - contentPanel.add(label_4); - - labelfilesize = new JLabel("0"); - labelfilesize.setHorizontalAlignment(SwingConstants.LEFT); - labelfilesize.setBounds(374, 293, 117, 14); - contentPanel.add(labelfilesize); - - JLabel label_6 = new JLabel("Verbleibend:"); - label_6.setBounds(102, 318, 71, 14); - contentPanel.add(label_6); - - JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); - label_7.setBounds(102, 268, 150, 14); - contentPanel.add(label_7); - - labelZeit = new JLabel("0"); - labelZeit.setHorizontalAlignment(SwingConstants.LEFT); - labelZeit.setBounds(374, 268, 117, 14); - contentPanel.add(labelZeit); - - labelverbleibend = new JLabel("0"); - labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT); - labelverbleibend.setBounds(183, 318, 108, 14); - contentPanel.add(labelverbleibend); - - JPanel panel = new JPanel(); - panel.setLayout(null); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); - contentPanel.add(panel); - - JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image"); - lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18)); - lblUploadIhresImage.setBounds(10, 11, 509, 22); - panel.add(lblUploadIhresImage); - - JTextPane txtpnFhreSieBitte = new JTextPane(); - txtpnFhreSieBitte - .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); - txtpnFhreSieBitte.setEditable(false); - txtpnFhreSieBitte.setBackground(SystemColor.menu); - txtpnFhreSieBitte.setBounds(10, 36, 509, 32); - panel.add(txtpnFhreSieBitte); - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); - contentPanel.add(separator); - - JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); - lblNewLabel_1.setForeground(Color.BLUE); - lblNewLabel_1.setBounds(20, 88, 61, 20); - contentPanel.add(lblNewLabel_1); - - JLabel label_3 = new JLabel(">"); - label_3.setBounds(80, 91, 14, 14); - contentPanel.add(label_3); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(91, 88, 46, 20); - contentPanel.add(lblVlimage); - - JLabel label_5 = new JLabel(">"); - label_5.setBounds(139, 91, 14, 14); - contentPanel.add(label_5); - - JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten"); - lblNeubearbeiten.setBounds(149, 91, 108, 14); - contentPanel.add(lblNeubearbeiten); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - contentPanel.add(separator_1); - - JButton btnCopyFileTo = new JButton("Copy File to Prod"); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - System.out.println("Copying file to " + user.path + "/" - + uploadFile.getName()); - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - btnCopyFileTo.setBounds(102, 343, 173, 23); - contentPanel.add(btnCopyFileTo); - - JLabel lblShritt = new JLabel("Schritt 1:"); - lblShritt.setBounds(24, 128, 57, 14); - contentPanel.add(lblShritt); - - JLabel lblSchritt = new JLabel("Schritt 2:"); - lblSchritt.setBounds(24, 172, 57, 14); - contentPanel.add(lblSchritt); - - JLabel lblSchritt_1 = new JLabel("Schritt 3:"); - lblSchritt_1.setBounds(20, 391, 57, 14); - contentPanel.add(lblSchritt_1); - - JLabel lblKlickenSieAuf = new JLabel( - "Klicken Sie auf \"Fertigstellen\"."); - lblKlickenSieAuf.setBounds(98, 391, 241, 14); - contentPanel.add(lblKlickenSieAuf); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBackground(UIManager.getColor("Button.background")); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane, BorderLayout.SOUTH); - { - finishButton.setEnabled(false); - finishButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - writeData(); - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - if (taskrun == true) { - try { - client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - task.cancel(true); - } - - } - }); - - btnZurck.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - dispose(); - EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI(); - m.setVisible(true); - } - }); - btnZurck.setActionCommand("Cancel"); - buttonPane.add(btnZurck); - finishButton.setActionCommand("Cancel"); - buttonPane.add(finishButton); - } - } - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); - setVisible(true); - - } - - private void buttonUploadActionPerformed(ActionEvent event) { - - progressBar.setValue(0); - btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick - // und - - try { - user = client.getFtpUser(); - System.out.println("name" + user.userName); - System.out.println("path" + user.path); - System.out.println("pass" + user.password); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); - - System.out.println(formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); - Image.image.setNewName(formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); - task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); - - task.addPropertyChangeListener(this); - task.execute(); - taskrun = true; - - } - - public void propertyChange(PropertyChangeEvent arg0) { - progress = 0; - if ("progress" == arg0.getPropertyName()) { - progress = (Integer) arg0.getNewValue(); - progressBar.setValue(progress); - - // Button zum Fertigstellen freischalten, wenn 100% erreicht sind - if (progress == 100) { - finishButton.setEnabled(true); - - } - if (progress == 0 || progress == 100) { - // not uploading currently - btnZurck.setEnabled(true); - } else { - // currently uploading, don't let user interact - btnZurck.setEnabled(false); - } - - } - - if ("speed" == arg0.getPropertyName()) { - speed = (double) arg0.getNewValue(); - // if(speed<=1){ - - UpSpeed.setText(String.valueOf(speed).substring(0, - String.valueOf(speed).lastIndexOf(".") + 3) - + " MB/s"); - - } - if ("bytesread" == arg0.getPropertyName()) { - bytesread = (long) arg0.getNewValue(); - labelfertig.setText((bytesread / 1024 / 1024) + " MB"); - labelverbleibend - .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) - + " MB"); - - labelZeit - .setText(String - .valueOf( - ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) - .substring( - 0, - String.valueOf( - (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) - .lastIndexOf(".")) - + " Minuten"); - - } - if ("filesize" == arg0.getPropertyName()) { - filesize = (long) arg0.getNewValue(); - labelfilesize.setText((filesize / 1024 / 1024) + " MB"); - - } - - } - - public boolean writeData() { - - try { - - client.writeVLdata(Image.image.getImagename(), - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), - Image.image.isLicensed(), Image.image.isInternet(), - Image.image.getRam(), Image.image.getCpu(), - "/srv/openslx/nfs/temp/" + Image.image.getNewName()); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - return false; - } - return true; - - } -} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/LinkImage_GUI.java b/Dozentenmodul/src/gui/LinkImage_GUI.java deleted file mode 100644 index b4052778..00000000 --- a/Dozentenmodul/src/gui/LinkImage_GUI.java +++ /dev/null @@ -1,471 +0,0 @@ -package 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.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -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; -import javax.swing.JSeparator; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.table.DefaultTableModel; - -import models.Lecture; -import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class LinkImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - private JTextField textFieldName; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - LinkImage_GUI dialog = new LinkImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public LinkImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - - @Override - public void windowOpened(WindowEvent arg0) { - textFieldName.requestFocusInWindow(); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 603) / 2; - int left = (screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel model = new DefaultTableModel(titles, 0); - - 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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - textFieldName = new JTextField(); - textFieldName.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - String stext = textFieldName.getText(); - modelAll.setRowCount(0); - initTableModel(modelAll); - - if (stext != "") - for (int i = 0; i < modelAll.getRowCount(); i++) { - - if (modelAll.getValueAt(i, 0).toString() - .startsWith(stext)) { - - } else { - modelAll.removeRow(i); - } - } - - } - - }); - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel( - "Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - ExtendedSearch_GUI es = new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - List list = client.getAllOS(); - comboBox.addItem(""); - for (int i = 0; i < list.size(); i++) { - comboBox.addItem(list.get(i)); - } - } catch (TException e2) { - // TODO Auto-generated catch block - e2.printStackTrace(); - } - comboBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - modelAll.setRowCount(0); - initTableModel(modelAll); - String selItem = comboBox.getSelectedItem().toString(); - if (selItem != "") { - for (int i = 0; i < modelAll.getRowCount(); i++) { - - if (modelAll.getValueAt(i, 2).equals(selItem)) { - - } else { - modelAll.removeRow(i); - } - } - - } - } - }); - 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) { - - LinkImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); - - tabbedPane.setBounds(10, 197, 557, 300); - contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - JTable tablemyImages = new JTable(); - tablemyImages.setModel(model); - 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(); - - 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(); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages = new JTable(); - 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 Images", null, scrollPaneCoopImages, - null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - initTableModel(modelAll); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); - EingabeVeranstaltungAllgemein_GUI eVAG = new EingabeVeranstaltungAllgemein_GUI(); - eVAG.setVisible(true); - dispose(); - } - }); - cancelButton.setActionCommand("CANCEL"); - buttonPane.add(cancelButton); - getRootPane().setDefaultButton(cancelButton); - } - { - JButton doLinkButton = new JButton( - "Veranstaltung erzeugen und abschlie\u00DFen"); - doLinkButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - String imagename = tableAllImages.getValueAt( - tableAllImages.getSelectedRow(), 0).toString(); - try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - System.out.println("Veranstaltung anlegen um: " - + formatter.format( - Lecture.lecture.getStartdate()) - .toString()); - client.writeLecturedata( - Lecture.lecture.getName(), - Lecture.lecture.getShortDesc(), - Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), Lecture.lecture - .isActive(), imagename, - person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); - JOptionPane - .showMessageDialog( - null, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.PLAIN_MESSAGE); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane - .showMessageDialog( - null, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", JOptionPane.ERROR_MESSAGE); - } - con.closeThriftConnection(); - dispose(); - - } - }); - doLinkButton.setActionCommand("OK"); - buttonPane.add(doLinkButton); - } - } - - 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); - - } - - public DefaultTableModel initTableModel(DefaultTableModel model) { - List images; - try { - images = client.getImageList(); - Iterator i = images.iterator(); - List ListObj = new ArrayList(); - int x = 0; - - while (i.hasNext()) { - - i.next(); - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), - images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; - ListObj.add(obj); - model.addRow(ListObj.get(x)); - x++; - - } - - return model; - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return model; - } - -} diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java deleted file mode 100644 index 172895d6..00000000 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ /dev/null @@ -1,260 +0,0 @@ -package gui; - -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.Image; -import java.awt.SystemColor; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JTextField; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; - -import models.SessionData; -import models.person; -import org.apache.thrift.TException; -//import org.apache.thrift.protocol.TBinaryProtocol; -//import org.apache.thrift.protocol.TProtocol; -import org.ini4j.Wini; -//import thrift.AuthenticationException; -//import thrift.ImageServer; -//import thrift.InvalidTokenException; -//import thrift.SessionData; -import thrift.MasterThriftConnection; -import thrift.ImageServer.Client; -import thrift.UserInfo; - -import config.config_file; - -@SuppressWarnings("serial") -public class Login_GUI extends JFrame { - - private JPanel contentPane; - private JTextField username; - private JPasswordField pass; - - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - // Prüfe und Erzeuge gegebenfalls Config - config_file cf = new config_file(); - boolean conf = cf.createConfig(); - if (conf == true) { - // Aufruf und Anzeige des Login Fensters - Login_GUI frame = new Login_GUI(); - frame.setVisible(true); - } else { - JOptionPane.showMessageDialog(null, - "Fehler beim erzeugen der Konfigurationsfile", - "Message", JOptionPane.ERROR_MESSAGE); - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - /** - * Create the frame. - */ - public Login_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - - // Fenster darf nicht vergrößert werden - setResizable(false); - try { - // Setzt das Look and Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - // Titel des Fensters setzen - setTitle("Dozentenmodul *Prototyp*"); - // Aktion die beim Schließen durchgeführt werden soll - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - // Größe des Fensters definieren - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 400) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 400); - // Erzeugen eines Panels - contentPane = new JPanel(); - // Hintergrund Farbe des Panels setzen - contentPane.setBackground(SystemColor.menu); - // Rahmen des Fensters setzen - contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); - setContentPane(contentPane); - // Layout setzen - contentPane.setLayout(null); - // Label für das Logo erzeugen - JLabel imgLabel = new JLabel(); - // Größe und Position des Logos festelegen - imgLabel.setBounds(150, 11, 350, 142); - // Pfadangabe des Logos - - ImageIcon icon = new ImageIcon(getClass().getResource( - "/Logo_bwLehrpool.png"), "Logo"); - // Skalierung des Logos - Image scaled = icon.getImage().getScaledInstance(270, 64, 0); - imgLabel.setIcon(new ImageIcon(scaled)); - // Hinzufügen des Logos in das Fenster - contentPane.add(imgLabel); - - // Erzeugen und Hinzufügen des Labels - JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); - LabelUser.setBounds(111, 164, 134, 20); - 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() { - public void actionPerformed(ActionEvent arg0) { - performLogin(); - } - }); - username.setBounds(304, 164, 196, 20); - contentPane.add(username); - username.setColumns(10); - - // Erzeugen und Hinzufügen des Labels - JLabel LabelPass = new JLabel("bwIDM-Passwort:"); - LabelPass.setBounds(111, 195, 134, 20); - contentPane.add(LabelPass); - - // Erzeugen, Hinzufügen und definierung der Aktion des Buttons - JButton BtnLogin = new JButton("Login"); - BtnLogin.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - performLogin(); - }// end actionPerformed - }); - - BtnLogin.setBounds(304, 244, 196, 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() { - public void actionPerformed(ActionEvent e) { - performLogin(); - } - }); - pass.setBounds(304, 195, 196, 20); - contentPane.add(pass); - }// end LoginGUI() - - //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; - try { - String passText = new String(pass.getPassword()); - System.out.println(username.getText() + " " + passText); - result = client.authenticate(username.getText(), passText); - - } catch (thrift.AuthenticationException e) { - System.out.println("Authentifizierung fehlgeschlagen: " + e.message); - JOptionPane.showMessageDialog(null, - "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", - "Anmeldung fehlgeschlagen", - JOptionPane.ERROR_MESSAGE); - - return; - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - 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(); - } - - } else { - JOptionPane.showMessageDialog(null, "Login denied!", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - }// end performLogin - -}// end class diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java deleted file mode 100644 index 3c75c74f..00000000 --- a/Dozentenmodul/src/gui/MainMenue_GUI.java +++ /dev/null @@ -1,443 +0,0 @@ -package gui; - -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JRadioButton; -import javax.swing.SwingConstants; -import javax.swing.ButtonGroup; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.ToolTipManager; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.ScrollPane; -import javax.swing.JTextArea; -import javax.swing.ImageIcon; - -@SuppressWarnings("serial") -public class MainMenue_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - String descNewImage, descEditImage, descDeleteImage, descSearchImage, - descNewLecture, descEditLecture, descDeleteLecture, - descSearchLecture = ""; - JRadioButton rdbtnImageNew; - JRadioButton rdbtnImageEdit; - JRadioButton rdbtnImageSearchDownload; - JRadioButton rdbtnVeranstaltungNew; - JRadioButton rdbtnImageDelete; - JRadioButton rdbtnVeranstaltungEdit; - private final ButtonGroup buttonGroup = new ButtonGroup(); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - MainMenue_GUI dialog = new MainMenue_GUI(); - dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - }// end main - - /** - * Create the dialog. - */ - public MainMenue_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 545, 366); - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 567, 69); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hauptmen\u00FC"); - 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("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion."); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 104, 567, 502); - contentPanel.setBackground(SystemColor.menu); - - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JPanel panelImage = new JPanel(); - panelImage.setBackground(SystemColor.menu); - panelImage.setBorder(new TitledBorder(null, "VL-Image", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelImage.setBounds(10, 146, 270, 170); - contentPanel.add(panelImage); - panelImage.setLayout(null); - - rdbtnImageNew = new JRadioButton("Neu"); - rdbtnImageNew - .setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden"); - rdbtnImageNew.setBounds(6, 22, 159, 23); - panelImage.add(rdbtnImageNew); - rdbtnImageNew.setSelected(true); - buttonGroup.add(rdbtnImageNew); - rdbtnImageNew.setBackground(SystemColor.menu); - - rdbtnImageEdit = new JRadioButton("Bearbeiten"); - rdbtnImageEdit - .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageEdit.setBounds(6, 48, 185, 23); - panelImage.add(rdbtnImageEdit); - buttonGroup.add(rdbtnImageEdit); - rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageEdit.setBackground(SystemColor.menu); - - rdbtnImageDelete = new JRadioButton("L\u00F6schen"); - rdbtnImageDelete.setEnabled(false); - buttonGroup.add(rdbtnImageDelete); - rdbtnImageDelete - .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageDelete.setBackground(SystemColor.menu); - rdbtnImageDelete.setBounds(6, 74, 185, 23); - 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"); - rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT); - rdbtnImageSearchDownload.setBackground(SystemColor.menu); - rdbtnImageSearchDownload.setBounds(6, 100, 185, 23); - panelImage.add(rdbtnImageSearchDownload); - - JPanel panelDesc = new JPanel(); - panelDesc.setLayout(null); - panelDesc.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Erklärung", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelDesc.setBackground(SystemColor.menu); - panelDesc.setBounds(290, 146, 270, 170); - contentPanel.add(panelDesc); - - ScrollPane scrollPaneDesc = new ScrollPane(); - scrollPaneDesc.setBounds(10, 15, 250, 145); - final JTextArea txtDesc = new JTextArea(); - txtDesc.setLineWrap(true); - txtDesc.setWrapStyleWord(true); - txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtDesc.setBackground(SystemColor.menu); - scrollPaneDesc.add(txtDesc); - // Pro AUswahl - txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."); - panelDesc.add(scrollPaneDesc); - - JPanel panelVeranstaltung = new JPanel(); - panelVeranstaltung.setLayout(null); - panelVeranstaltung.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelVeranstaltung.setBackground(SystemColor.menu); - panelVeranstaltung.setBounds(10, 327, 270, 170); - contentPanel.add(panelVeranstaltung); - - rdbtnVeranstaltungNew = new JRadioButton("Neu"); - buttonGroup.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew - .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23); - panelVeranstaltung.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew.setBackground(SystemColor.menu); - - rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten"); - rdbtnVeranstaltungEdit - .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 - .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 - .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungSearch.setBackground(SystemColor.menu); - rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungSearch); - - JLabel lblCrumbStart = new JLabel("Startseite"); - lblCrumbStart.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - Login_GUI lw = new Login_GUI(); - lw.setVisible(true); - MainMenue_GUI.this.setVisible(false); - } - }); - lblCrumbStart.setForeground(Color.BLUE); - lblCrumbStart.setBounds(10, 0, 52, 14); - contentPanel.add(lblCrumbStart); - - JLabel label = new JLabel(">"); - label.setBounds(60, 0, 13, 14); - contentPanel.add(label); - - JLabel lblRechtshinweis = new JLabel("Rechtshinweis"); - lblRechtshinweis.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - BillOfRights_GUI rb = new BillOfRights_GUI(); - rb.setVisible(true); - MainMenue_GUI.this.setVisible(false); - } - }); - lblRechtshinweis.setForeground(Color.BLUE); - lblRechtshinweis.setBounds(72, 0, 68, 14); - contentPanel.add(lblRechtshinweis); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(142, 0, 13, 14); - contentPanel.add(label_1); - - JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); - lblNewLabel_1.setBounds(150, 0, 74, 14); - contentPanel.add(lblNewLabel_1); - - JPanel panelNews = new JPanel(); - panelNews.setLayout(null); - panelNews.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "News", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelNews.setBackground(SystemColor.menu); - panelNews.setBounds(290, 327, 270, 170); - contentPanel.add(panelNews); - - ScrollPane scrollPaneNews = new ScrollPane(); - // scrollPaneDesc.setBounds(10, 15, 250, 145); - scrollPaneNews.setBounds(10, 15, 250, 145); - JTextArea txtNews = new JTextArea(); - txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtNews.setBackground(SystemColor.menu); - txtNews.setWrapStyleWord(true); - txtNews.setLineWrap(true); - txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten, sind als HS-spezifisch :)"); - scrollPaneNews.add(txtNews); - panelNews.add(scrollPaneNews); - - /* - * Funktion Texte für das Klicken der RadioButtons - */ - rdbtnImageNew.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."; - txtDesc.setText(descNewImage); - } - }); - rdbtnImageEdit.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descEditImage = "Bearbeiten Sie die hinterlegten Informationen zu einem Image oder laden Sie eine neue .vmdk-Datei hoch."; - txtDesc.setText(descEditImage); - } - }); - rdbtnImageDelete.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese."; - txtDesc.setText(descDeleteImage); - } - }); - rdbtnImageSearchDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen."; - txtDesc.setText(descSearchImage); - } - }); - rdbtnVeranstaltungNew.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() { - public void actionPerformed(ActionEvent e) { - descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; - txtDesc.setText(descEditLecture); - } - }); - rdbtnVeranstaltungDelete.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; - } - }); - rdbtnVeranstaltungSearch.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); - } - }); - /* - * Ende der Radiobuttons - */ - - JLabel lblGrafik = new JLabel(""); - // ToolTipp für Grafik - lblGrafik - .setToolTipText("" - + "Ein virtuelles Labor besteht immer aus den beiden Komponenten
" - + "Image und Veranstaltung. Ein Image ist dabei die Grundlage f\u00FCr
" - + "mehrere Veranstaltungen. Somit kann eine neue Veranstaltung
" - + "erstellt werden, ohne ein neues Image hochladen zu m\u00FCssen.


" - + "Image: Das Image enth\u00E4lt die ben\u00F6tigte Software, die im
" - + "virtuellen Labor ben\u00F6tigt wird. Es wird von genau einem Dozenten
" - + "angelegt und besitzt einen allgemeinen Namen, z.B. \"Programmieren\".
" - + "Bei einem Image handelt es sich um eine Datei vom Typ VMDK.


" - + "Veranstaltung: Es k\u00F6nnen nun, basierend auf einem Image,
" - + " beliebig viele Veranstaltungen von unterschiedlichen Dozenten erstellt
" - + "werden. Diese k\u00F6nnten z.B. konkret \"Web-Entwicklung\" oder \"K\u00FCnstliche
" - + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" - + "\"Programmieren\"."); - lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/Image_zu_Veranstaltung_HDD.png"))); - // ToolTipp lange anzeigen - 60sec - ToolTipManager.sharedInstance().setDismissDelay(60000); - ToolTipManager.sharedInstance().registerComponent(lblGrafik); - lblGrafik.setBounds(82, 11, 391, 110); - contentPanel.add(lblGrafik); - - JTextPane txtpnUmDetaillierteInformationen = new JTextPane(); - txtpnUmDetaillierteInformationen - .setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik."); - txtpnUmDetaillierteInformationen.setEditable(false); - txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu); - txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22); - contentPanel.add(txtpnUmDetaillierteInformationen); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton continueButton = new JButton("Weiter"); - - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if (rdbtnImageNew.isSelected() == true) { - EingabeImageAllgemein_GUI sr = new EingabeImageAllgemein_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) { - SearchMethod_GUI sm = new SearchMethod_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) { - EingabeVeranstaltungAllgemein_GUI av = new EingabeVeranstaltungAllgemein_GUI(); - av.setVisible(true); - dispose(); - } else if (rdbtnVeranstaltungEdit.isSelected() == true) { - SearchEditLecture_GUI sl = new SearchEditLecture_GUI(); - sl.setVisible(true); - dispose(); - } - } - }); - continueButton.setActionCommand("OK"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(continueButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 91, 587, 2); - getContentPane().add(separator); - } - - 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); - - }// end main - -}// end class diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java deleted file mode 100644 index dbc2562c..00000000 --- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java +++ /dev/null @@ -1,495 +0,0 @@ -package 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.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; -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.Image; -import models.person; -//import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - - -@SuppressWarnings("serial") -public class SearchEditImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - 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 rowSorterAll = new TableRowSorter( modelAll ); - final TableRowSorter rowSorterMyImages = new TableRowSorter( 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. - */ - public SearchEditImage_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*"); - //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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - 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)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); - - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list=client.getAllOS(); - //Leeres Item hinzufügen - comboBox.addItem(""); - for(int i=0;i"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - 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.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.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(); - 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 Images", null, scrollPaneCoopImages, null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - - - - JButton btnDownload = new JButton("Download"); - btnDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - - if(tablemyImages.getSelectedRow()!=-1) - { - String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); - - Image.image.setImageId(imageid); - String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString(); - - Image.image.setVersion(imageversion); - SearchEditImage_GUI.this.setVisible(false); - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - con.closeThriftConnection(); - - - - } - else{ - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - 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(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); - - //Image.image.setImageId(imageid); - if(tabbedPane.getSelectedIndex()==0){ - 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); - con.closeThriftConnection(); - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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 images; - try { - //Hole eine Liste der Images - images = client.getImageList(); - - Iterator i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime(),"",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(); - } - return model; - } - - } - - diff --git a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java b/Dozentenmodul/src/gui/SearchEditLecture_GUI.java deleted file mode 100644 index 9553bc6e..00000000 --- a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java +++ /dev/null @@ -1,448 +0,0 @@ -package 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.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -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.Lecture; -import models.person; -//import models.person; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - - -@SuppressWarnings("serial") -public class SearchEditLecture_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JTable tableAllLectures; - JTable tablemyLectures; - 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 rowSorterAll = new TableRowSorter( modelAll ); - final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures ); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchEditLecture_GUI dialog = new SearchEditLecture_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchEditLecture_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*"); - //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("Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearch_GUI es=new ExtendedSearch_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(); - SearchEditLecture_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) { - System.out.println(tabbedPane.getSelectedIndex()); - 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); - System.out.println("haaaaaaaaaaa"); - 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(); - JTable 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(); - JTable 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(); - JTable 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 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(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - - //Image.image.setImageId(imageid); - if(tabbedPane.getSelectedIndex()==0){ - - - Lecture.lecture.setid(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString()); - Lecture.lecture.setName(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 0).toString()); - Lecture.lecture.setDesc(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 1).toString()); - String date=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 2).toString(); - Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 6).toString()); - String startdate=date.substring(0,date.indexOf(" ")); - String enddate=date.substring(date.indexOf(" ")); - DateFormat df=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - - try { - Lecture.lecture.setEnddate(df.parse(enddate)); - Lecture.lecture.setStartdate(df.parse(startdate)); - } catch (ParseException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - if(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 3).toString().equals("1")){ - Lecture.lecture.setActive(true); - } - else - { - Lecture.lecture.setActive(false); - } - - con.closeThriftConnection(); - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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 lectures; - try { - //Hole eine Liste der Images - lectures = client.getLectureList(); - Iterator 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/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java deleted file mode 100644 index 53257f48..00000000 --- a/Dozentenmodul/src/gui/SearchImage_GUI.java +++ /dev/null @@ -1,459 +0,0 @@ -package 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.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.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.ListSelectionModel; -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 org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class SearchImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); - final TableRowSorter rowSorterAll = new TableRowSorter( - modelAll); - final TableRowSorter rowSorterMyImages = new TableRowSorter( - modelMyImages); - - /** - * 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. - */ - public SearchImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - // Beendet die Anwendung nach klick auf X - 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*"); - // 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 VL-Image"); - 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); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - 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)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - textFieldName.getText(), 0)); - - } - } - }); - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel( - "Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es = new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list = client.getAllOS(); - // Leeres Item hinzufügen - comboBox.addItem(""); - 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(); - } - // 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)); - } - } - - }); - 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ü - SearchImage_GUI.this.setVisible(false); - MainMenue_GUI main = new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("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); - } - - } - }); - - 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(); - 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); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages = new JTable(); - 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 Images", null, scrollPaneCoopImages, - null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable 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(); - JTable 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); - - JButton btnDownload = new JButton("Download"); - 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); - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - 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); - } - } - - 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 images; - try { - // Hole eine Liste der Images - - images = client.getImageList(); - Iterator i = images.iterator(); - - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte für die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), - images.get(x).getLectureName(), - images.get(x).getUserData(), - images.get(x).getUpdateTime() }; - // Füge diese Objekte der Tabelle hinzu - 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/SearchMethod_GUI.java b/Dozentenmodul/src/gui/SearchMethod_GUI.java deleted file mode 100644 index 24a12959..00000000 --- a/Dozentenmodul/src/gui/SearchMethod_GUI.java +++ /dev/null @@ -1,243 +0,0 @@ -package 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.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.ButtonGroup; -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.JSeparator; -import javax.swing.JTextArea; -import javax.swing.JTextPane; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; - -@SuppressWarnings("serial") -public class SearchMethod_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnNachEinemVlimage; - JRadioButton rdbtnNachEinerVeranstaltung; - private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchMethod_GUI dialog = new SearchMethod_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchMethod_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); - setResizable(false); - - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("bwLehrpool Suite *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 603) / 2; - int left=(screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - 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("Eingabe Ihrer Daten"); - 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.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 493); - 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, "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); - - 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.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.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); - - 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) { - - SearchMethod_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Suchmethode"); - lblNewLabel_1.setBounds(146, 11, 82, 14); - contentPanel.add(lblNewLabel_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - if(rdbtnNachEinemVlimage.isSelected()==true) - { - SearchImage_GUI ea=new SearchImage_GUI(); - ea.setVisible(true); - dispose(); - } - } - - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - 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/VmWareLink_GUI.java b/Dozentenmodul/src/gui/VmWareLink_GUI.java deleted file mode 100644 index 43df06a6..00000000 --- a/Dozentenmodul/src/gui/VmWareLink_GUI.java +++ /dev/null @@ -1,215 +0,0 @@ -package gui; - -import java.awt.Desktop; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.JCheckBox; -import javax.swing.event.ChangeListener; -import javax.swing.event.ChangeEvent; - -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; - - -@SuppressWarnings("serial") -public class VmWareLink_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JCheckBox chckbxNewCheckBox; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - VmWareLink_GUI dialog = new VmWareLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public VmWareLink_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - System.exit(0); - } - }); - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBounds(0, 0, 577, 80); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Hinweis VMWare Player"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); - } - - JTextPane txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 42); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 104, 567, 502); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JTextPane txtpnUmIhreVmdk = new JTextPane(); - txtpnUmIhreVmdk.setBackground(SystemColor.menu); - txtpnUmIhreVmdk.setEditable(false); - txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden."); - txtpnUmIhreVmdk.setBounds(10, 16, 499, 66); - contentPanel.add(txtpnUmIhreVmdk); - - JLabel lblNewLabel_1 = new JLabel("Windows: "); - lblNewLabel_1.addMouseListener(new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent arg0) { - URI url; - try { - url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"); - Desktop.getDesktop().browse(url); - } catch (URISyntaxException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - }); - - lblNewLabel_1.setBounds(10, 93, 499, 14); - contentPanel.add(lblNewLabel_1); - - chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen."); - chckbxNewCheckBox.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - if(chckbxNewCheckBox.isSelected()==true) - { - try { - Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - ini.put("main", "vmware",true); - ini.store(); - } catch (InvalidFileFormatException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - } - }); - chckbxNewCheckBox.setBounds(6, 472, 555, 23); - contentPanel.add(chckbxNewCheckBox); - - JLabel lbllinuxvmwarePlayer = new JLabel("Linux: "); - lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14); - contentPanel.add(lbllinuxvmwarePlayer); - - JLabel lblvmwarePlayerDownload = new JLabel("vmWare Player Download"); - lblvmwarePlayerDownload.setBounds(10, 118, 499, 14); - contentPanel.add(lblvmwarePlayerDownload); - - JLabel lblvmwarePlayerDownload_1 = new JLabel("vmWare Player Download"); - lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14); - contentPanel.add(lblvmwarePlayerDownload_1); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - MainMenue_GUI ea=new MainMenue_GUI(); - ea.setVisible(true); - dispose(); - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 617, 587, 2); - getContentPane().add(separator); - } - { - JSeparator separator = new JSeparator(); - separator.setBounds(0, 91, 587, 2); - getContentPane().add(separator); - } - { - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - { - JMenu mnHilfe = new JMenu("Hilfe"); - menuBar.add(mnHilfe); - { - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnHilfe.add(mntmFaq); - } - { - JMenuItem mntmHilfe = new JMenuItem("Hilfe"); - mnHilfe.add(mntmHilfe); - } - } - } - - - - } -} diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java new file mode 100644 index 00000000..d19e5c9f --- /dev/null +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -0,0 +1,442 @@ +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.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.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.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 org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class DeleteImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + JTable tablemyImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; + ThriftConnection con=new ThriftConnection(); + Client client=con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); + final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); + final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); + final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + DeleteImage_GUI dialog = new DeleteImage_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public DeleteImage_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung nach klick auf X + 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*"); + //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 VL-Image"); + 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); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + 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)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); + + } + }}); + + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Öffnet das Fenster Extended GUI + 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(); + try { + //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List list=client.getAllOS(); + //Leeres Item hinzufügen + comboBox.addItem(""); + for(int i=0;i"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); + lblNewLabel_1.setBounds(146, 11, 85, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + System.out.println(tabbedPane.getSelectedIndex()); + if(tabbedPane.getSelectedIndex()==0){ + + + + } + else if(tabbedPane.getSelectedIndex()==1){ + String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + //rowSorterMyImages.toggleSortOrder(0); + } + + } + }); + + 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); + initTableModel(modelAll); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable 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(); + + 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.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable 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(); + JTable 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); + + + + + 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); + } + }); + btnDelete.setBounds(449, 508, 118, 23); + contentPanel.add(btnDelete); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton mainButton = new JButton("Hauptmen\u00FC"); + mainButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + mainButton.setActionCommand("Cancel"); + buttonPane.add(mainButton); + } + } + + 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 images; + try { + //Hole eine Liste der Images + + images = client.getImageList(); + Iterator i=images.iterator(); + + int x=0; + + while(i.hasNext()) + { + //erzeuge Objekte für die Tabelle + Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; + //Füge diese Objekte der Tabelle hinzu + 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/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java new file mode 100644 index 00000000..9d8ffdfe --- /dev/null +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -0,0 +1,347 @@ +package gui.image; + +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.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Map; +import javax.swing.JButton; +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.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import org.apache.thrift.TException; +import models.Image; +import models.person; +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class EditImageAllgemein_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField Vorname; + private JTextField Nachname; + private JTextField Hochschule; + private JTextField EMail; + private JTextField imagename; + ThriftConnection con=new ThriftConnection(); + Client client=con.getThriftConnection(); + private JPanel panel_2; + private JLabel lblNewLabel; + private JTextPane txtpnBitteWhlenSie; + private JPanel buttonPane; + private JButton backButton; + private JButton okButton; + + /** + * Create the dialog. + */ + public EditImageAllgemein_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); + System.exit(0); + } + }); + //Verhindert das vergrößern des Fensters + setResizable(false); + + try { + 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 der Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + initData(); + getContentPane().setLayout(null); + { + panel_2 = new JPanel(); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 11, 577, 57); + getContentPane().add(panel_2); + panel_2.setLayout(null); + { + lblNewLabel = new JLabel("Bearbeiten Ihrer Daten"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel_2.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel_2.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 66, 557, 369); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel label = new JLabel("Vorname: *"); + label.setBackground(SystemColor.menu); + label.setBounds(10, 245, 125, 20); + panel_1.add(label); + + Vorname = new JTextField(); + Vorname.setEditable(false); + Vorname.setEnabled(false); + Vorname.setBackground(Color.WHITE); + Vorname.setText(person.verantwortlicher.getVorname()); + Vorname.setColumns(10); + Vorname.setBounds(145, 245, 350, 20); + panel_1.add(Vorname); + + JLabel label_7 = new JLabel("Nachname: *"); + label_7.setBackground(SystemColor.menu); + label_7.setBounds(10, 276, 125, 20); + panel_1.add(label_7); + + Nachname = new JTextField(); + Nachname.setEnabled(false); + Nachname.setEditable(false); + Nachname.setBackground(Color.WHITE); + Nachname.setText(person.verantwortlicher.getName()); + Nachname.setColumns(10); + Nachname.setBounds(145, 276, 350, 20); + panel_1.add(Nachname); + + JLabel label_8 = new JLabel("Hochschule: *"); + label_8.setBackground(SystemColor.menu); + label_8.setBounds(10, 307, 125, 20); + panel_1.add(label_8); + + Hochschule = new JTextField(); + Hochschule.setEnabled(false); + Hochschule.setEditable(false); + Hochschule.setBackground(Color.WHITE); + Hochschule.setText(person.verantwortlicher.getHochschule()); + Hochschule.setColumns(10); + Hochschule.setBounds(145, 307, 350, 20); + panel_1.add(Hochschule); + + JLabel label_9 = new JLabel("E-Mail: *"); + label_9.setBackground(SystemColor.menu); + label_9.setBounds(10, 338, 125, 20); + panel_1.add(label_9); + + EMail = new JTextField(); + EMail.setEnabled(false); + EMail.setEditable(false); + EMail.setBackground(Color.WHITE); + EMail.setText(person.verantwortlicher.getEMail()); + EMail.setColumns(10); + EMail.setBounds(145, 338, 350, 20); + panel_1.add(EMail); + + JLabel lblImagename = new JLabel("Imagename: *"); + lblImagename.setBackground(SystemColor.menu); + lblImagename.setBounds(10, 31, 125, 20); + panel_1.add(lblImagename); + + imagename = new JTextField(); + imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); + imagename.setBackground(Color.WHITE); + imagename.setText(Image.image.getImagename()); + imagename.setColumns(10); + imagename.setBounds(145, 31, 350, 20); + panel_1.add(imagename); + + JTextArea txtrGebenSieBitte = new JTextArea(); + txtrGebenSieBitte.setBackground(SystemColor.menu); + txtrGebenSieBitte.setLineWrap(true); + txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); + txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + txtrGebenSieBitte.setBounds(145, 62, 350, 110); + panel_1.add(txtrGebenSieBitte); + + 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); + lblPflichtfelder.setBounds(10, 442, 136, 14); + contentPanel.add(lblPflichtfelder); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); + EditImageAllgemein_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + 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("Bearbeiten"); + lblNewLabel_1.setBounds(146, 11, 71, 14); + contentPanel.add(lblNewLabel_1); + { + buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar + //Image.image.setImagename(imagename.getText()); + con.closeThriftConnection(); + MainMenue_GUI sr=new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + backButton.setActionCommand("CANCEL"); + buttonPane.add(backButton); + + } + { + okButton = new JButton("Weiter"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + System.out.println("text length="+imagename.getText().length()); + //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar + + //TODO + //Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht + //der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF??? + if(imagename.getText().length() <= 0){ + JOptionPane.showMessageDialog(null, + "Bitte geben Sie einen Labornamen ein.", + "Daten nicht vollständig", + JOptionPane.WARNING_MESSAGE); + } else { + Image.image.setNewName(imagename.getText()); + con.closeThriftConnection(); + EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); + ea.setVisible(true); + dispose(); + }//end else + } + }); + + 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); + //setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs})); + + } + + public void initData(){ + try { + + Map map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); + if(map.get("internet").equals("0")){ + Image.image.setInternet(false); + } + else + { + Image.image.setInternet(true); + } + if(map.get("license").equals("0")){ + Image.image.setLicensed(false); + } + else{ + Image.image.setLicensed(true); + } + Image.image.setImagename(map.get("name")); + Image.image.setRam(Integer.parseInt(map.get("ram"))); + Image.image.setCpu(Integer.parseInt(map.get("cpu"))); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + +} diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java new file mode 100644 index 00000000..c938181e --- /dev/null +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -0,0 +1,359 @@ +package gui.image; + + +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.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +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.JSeparator; +import javax.swing.JSpinner; +import javax.swing.JTextArea; +import javax.swing.JTextPane; +import javax.swing.SpinnerNumberModel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import models.Image; + +@SuppressWarnings("serial") +public class EditImageTechnisch_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JSpinner spinnerCPU; + JSpinner spinnerRam; + JRadioButton rdbtnlicenseJa; + JRadioButton rdbtnlicenseNein; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + private final ButtonGroup buttonGrouplicense = new ButtonGroup(); + private final ButtonGroup buttonGroupInternet = new ButtonGroup(); + + + /** + * Create the dialog. + */ + public EditImageTechnisch_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung bei Klick auf das X + + System.exit(0); + } + + }); + //Verhindert das Vergrößern des Fensters + setResizable(false); + + try { + //setzt das Look & Feel + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Setzt den Titel des Fensters + setTitle("bwLehrpool Suite *Prototyp*"); + //Zentriert das Fenster + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 66, 557, 95); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + rdbtnlicenseJa = new JRadioButton("Ja"); + rdbtnlicenseJa.setSelected(true); + buttonGrouplicense.add(rdbtnlicenseJa); + rdbtnlicenseJa.setBounds(266, 29, 109, 23); + panel_1.add(rdbtnlicenseJa); + + rdbtnlicenseNein = new JRadioButton("Nein"); + buttonGrouplicense.add(rdbtnlicenseNein); + rdbtnlicenseNein.setBounds(377, 29, 109, 23); + panel_1.add(rdbtnlicenseNein); + if(Image.image.isLicensed()==true){ + rdbtnlicenseJa.setSelected(true); + } + else + { + rdbtnlicenseNein.setSelected(true); + } + + + + JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + rdbtnInternetJa = new JRadioButton("Ja"); + buttonGroupInternet.add(rdbtnInternetJa); + rdbtnInternetJa.setBounds(266, 57, 109, 23); + panel_1.add(rdbtnInternetJa); + + rdbtnInternetNein = new JRadioButton("Nein"); + rdbtnInternetNein.setSelected(true); + buttonGroupInternet.add(rdbtnInternetNein); + rdbtnInternetNein.setBounds(377, 57, 109, 23); + panel_1.add(rdbtnInternetNein); + if(Image.image.isInternet()==true){ + rdbtnInternetJa.setSelected(true); + } + else + { + rdbtnInternetNein.setSelected(true); + } + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Macht dieses Fenster unsichtbar und das vorhergehende Fenster sichtbar + EditImageTechnisch_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 172, 557, 338); + contentPanel.add(panel_2); + + JTextArea txtrHinweisSolltenSie = new JTextArea(); + txtrHinweisSolltenSie.setBackground(SystemColor.menu); + txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); + txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); + txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); + panel_2.add(txtrHinweisSolltenSie); + + JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); + lblNewLabel_3.setBounds(10, 91, 280, 20); + panel_2.add(lblNewLabel_3); + + JLabel lblMindestens = new JLabel("mindestens"); + lblMindestens.setBounds(315, 91, 60, 20); + panel_2.add(lblMindestens); + + spinnerRam = new JSpinner(); + spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); + spinnerRam.setBounds(385, 88, 29, 20); + spinnerRam.setValue(Image.image.getRam()); + panel_2.add(spinnerRam); + + JLabel lblGbyte = new JLabel("GByte"); + lblGbyte.setBounds(424, 91, 46, 20); + panel_2.add(lblGbyte); + + JTextArea txtrBeispielWindows = new JTextArea(); + txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); + txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrBeispielWindows.setBackground(SystemColor.menu); + txtrBeispielWindows.setBounds(20, 111, 280, 55); + panel_2.add(txtrBeispielWindows); + + JTextArea txtrBeispielWindows_1 = new JTextArea(); + txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); + txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrBeispielWindows_1.setBackground(SystemColor.menu); + txtrBeispielWindows_1.setBounds(20, 226, 280, 55); + panel_2.add(txtrBeispielWindows_1); + + JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); + lblWieVieleCpus.setBounds(10, 201, 280, 20); + panel_2.add(lblWieVieleCpus); + + JLabel label_3 = new JLabel("mindestens"); + label_3.setBounds(315, 201, 60, 20); + panel_2.add(label_3); + + spinnerCPU = new JSpinner(); + spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); + spinnerCPU.setBounds(385, 198, 29, 20); + spinnerCPU.setValue(Image.image.getCpu()); + panel_2.add(spinnerCPU); + + JLabel lblKerne = new JLabel("Kerne"); + lblKerne.setBounds(424, 201, 46, 20); + panel_2.add(lblKerne); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //Setzt die Imagewerte in das Model + Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); + Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); + if(rdbtnInternetJa.isSelected()==true) + { + Image.image.setInternet(true); + } + else + { + Image.image.setInternet(false); + } + + if(rdbtnlicenseJa.isSelected()==true) + { + Image.image.setLicensed(true); + } + else + { + Image.image.setLicensed(false); + } + //Öffnet das vorherige Fenster + EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); + sr.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); + Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); + if(rdbtnInternetJa.isSelected()==true) + { + Image.image.setInternet(true); + } + else + { + Image.image.setInternet(false); + } + + if(rdbtnlicenseJa.isSelected()==true) + { + Image.image.setLicensed(true); + } + else + { + Image.image.setLicensed(false); + } + //Öffnet das nächste Fenster + FTPEditUploader_GUI ea=new FTPEditUploader_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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); + + } + + + + } + diff --git a/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java new file mode 100644 index 00000000..1cff0677 --- /dev/null +++ b/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java @@ -0,0 +1,304 @@ +package gui.image; + + +import gui.intro.MainMenue_GUI; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import javax.swing.JTextField; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; + +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.border.TitledBorder; +import javax.swing.JTextArea; + +import models.Image; +import models.person; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +@SuppressWarnings("serial") +public class EingabeImageAllgemein_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField Vorname; + private JTextField Nachname; + private JTextField Hochschule; + private JTextField EMail; + private JTextField imagename; + + /** + * Create the dialog. + */ + public EingabeImageAllgemein_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet das Fenster auf X + System.exit(0); + } + @Override + public void windowOpened(WindowEvent arg0) { + imagename.requestFocusInWindow(); + } + }); + //Verhindert das Vergrößern des Fensters + setResizable(false); + + try { + //setzt das Look & Feel + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Setzt den Titel + setTitle("bwLehrpool Suite *Prototyp*"); + //Zentriert das Fenster + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 66, 557, 369); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel label = new JLabel("Vorname: *"); + label.setBackground(SystemColor.menu); + label.setBounds(10, 245, 125, 20); + panel_1.add(label); + + Vorname = new JTextField(); + Vorname.setEnabled(false); + Vorname.setEditable(false); + Vorname.setBackground(Color.WHITE); + Vorname.setText(person.verantwortlicher.getVorname()); + Vorname.setColumns(10); + Vorname.setBounds(145, 245, 350, 20); + panel_1.add(Vorname); + + JLabel label_7 = new JLabel("Nachname: *"); + label_7.setBackground(SystemColor.menu); + label_7.setBounds(10, 276, 125, 20); + panel_1.add(label_7); + + Nachname = new JTextField(); + Nachname.setEnabled(false); + Nachname.setEditable(false); + Nachname.setBackground(Color.WHITE); + Nachname.setText(person.verantwortlicher.getName()); + Nachname.setColumns(10); + Nachname.setBounds(145, 276, 350, 20); + panel_1.add(Nachname); + + JLabel label_8 = new JLabel("Hochschule: *"); + label_8.setBackground(SystemColor.menu); + label_8.setBounds(10, 307, 125, 20); + panel_1.add(label_8); + + Hochschule = new JTextField(); + Hochschule.setEnabled(false); + Hochschule.setEditable(false); + Hochschule.setBackground(Color.WHITE); + Hochschule.setText(person.verantwortlicher.getHochschule()); + Hochschule.setColumns(10); + Hochschule.setBounds(145, 307, 350, 20); + panel_1.add(Hochschule); + + JLabel label_9 = new JLabel("E-Mail: *"); + label_9.setBackground(SystemColor.menu); + label_9.setBounds(10, 338, 125, 20); + panel_1.add(label_9); + + EMail = new JTextField(); + EMail.setEnabled(false); + EMail.setEditable(false); + EMail.setBackground(Color.WHITE); + EMail.setText(person.verantwortlicher.getEMail()); + EMail.setColumns(10); + EMail.setBounds(145, 338, 350, 20); + panel_1.add(EMail); + + JLabel lblImagename = new JLabel("Imagename: *"); + lblImagename.setBackground(SystemColor.menu); + lblImagename.setBounds(10, 31, 125, 20); + panel_1.add(lblImagename); + + + imagename = new JTextField(); + imagename.setBackground(Color.WHITE); + imagename.setText((String) null); + imagename.setColumns(10); + imagename.setBounds(145, 31, 350, 20); + imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurück kommt zur Seite + panel_1.add(imagename); + + JTextArea txtrGebenSieBitte = new JTextArea(); + txtrGebenSieBitte.setEditable(false); + txtrGebenSieBitte.setBackground(SystemColor.menu); + txtrGebenSieBitte.setLineWrap(true); + txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); + txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + txtrGebenSieBitte.setBounds(145, 62, 350, 110); + panel_1.add(txtrGebenSieBitte); + + 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 lblPflichtfelder = new JLabel("* Pflichtfelder"); + lblPflichtfelder.setBounds(10, 442, 136, 14); + contentPanel.add(lblPflichtfelder); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Öffnet das Hauptmenü + EingabeImageAllgemein_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Image.image.setImagename(imagename.getText()); + MainMenue_GUI sr=new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + backButton.setActionCommand("Cancel"); + buttonPane.add(backButton); + } + { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //Prüft die Eingabe + if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) + { + //Schreibt die Daten in das Model + Image.image.setImagename(imagename.getText()); + EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI(); + ea.setVisible(true); + dispose(); + } + else{ + JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", + "Error", JOptionPane.ERROR_MESSAGE); + } + } + }); + continueButton.setActionCommand("OK"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + }//end main +} diff --git a/Dozentenmodul/src/gui/image/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EingabeImageTechnisch_GUI.java new file mode 100644 index 00000000..fd25d2cf --- /dev/null +++ b/Dozentenmodul/src/gui/image/EingabeImageTechnisch_GUI.java @@ -0,0 +1,366 @@ +package gui.image; + + +import gui.intro.MainMenue_GUI; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.border.TitledBorder; +import javax.swing.JTextArea; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import javax.swing.JRadioButton; +import javax.swing.ButtonGroup; +import javax.swing.JSpinner; +import javax.swing.SpinnerNumberModel; + +import models.Image; + +@SuppressWarnings("serial") +public class EingabeImageTechnisch_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JSpinner spinnerCPU; + JSpinner spinnerRam; + JRadioButton rdbtnlicenseJa; + JRadioButton rdbtnlicenseNein; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + private final ButtonGroup buttonGrouplicense = new ButtonGroup(); + private final ButtonGroup buttonGroupInternet = new ButtonGroup(); + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public EingabeImageTechnisch_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 66, 557, 124); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + rdbtnlicenseNein = new JRadioButton("Nein"); + buttonGrouplicense.add(rdbtnlicenseNein); + rdbtnlicenseNein.setBounds(377, 29, 46, 23); + panel_1.add(rdbtnlicenseNein); + + rdbtnInternetNein = new JRadioButton("Nein"); + rdbtnInternetNein.setSelected(true); + buttonGroupInternet.add(rdbtnInternetNein); + rdbtnInternetNein.setBounds(377, 57, 46, 23); + panel_1.add(rdbtnInternetNein); + + JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + JButton btnInternetSettings = new JButton("Einstellungen..."); + btnInternetSettings.setEnabled(false); + btnInternetSettings.setBounds(439, 57, 108, 23); + panel_1.add(btnInternetSettings); + + rdbtnInternetJa = new JRadioButton("Ja"); + + buttonGroupInternet.add(rdbtnInternetJa); + rdbtnInternetJa.setBounds(266, 57, 41, 23); + panel_1.add(rdbtnInternetJa); + + rdbtnlicenseJa = new JRadioButton("Ja"); + rdbtnlicenseJa.setSelected(true); + buttonGrouplicense.add(rdbtnlicenseJa); + rdbtnlicenseJa.setBounds(266, 29, 41, 23); + panel_1.add(rdbtnlicenseJa); + + JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:"); + lblLizenzserverEintragen.setBounds(10, 85, 250, 20); + panel_1.add(lblLizenzserverEintragen); + + JButton btnLicenseServer = new JButton("Server-Adresse..."); + btnLicenseServer.setEnabled(false); + btnLicenseServer.setBounds(266, 84, 157, 23); + panel_1.add(btnLicenseServer); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(11, 196, 557, 338); + contentPanel.add(panel_2); + + JLabel lblGbyte = new JLabel("GByte"); + lblGbyte.setBounds(424, 91, 46, 20); + panel_2.add(lblGbyte); + + spinnerCPU = new JSpinner(); + spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); + spinnerCPU.setBounds(385, 188, 29, 20); + panel_2.add(spinnerCPU); + + JTextArea txtrBeispielWindows = new JTextArea(); + txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); + txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrBeispielWindows.setBackground(SystemColor.menu); + txtrBeispielWindows.setBounds(10, 122, 280, 55); + panel_2.add(txtrBeispielWindows); + + + + JLabel lblKerne = new JLabel("Kerne"); + lblKerne.setBounds(424, 191, 46, 20); + panel_2.add(lblKerne); + + JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); + lblWieVieleCpus.setBounds(10, 191, 280, 20); + panel_2.add(lblWieVieleCpus); + + spinnerRam = new JSpinner(); + spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); + spinnerRam.setBounds(385, 88, 29, 20); + panel_2.add(spinnerRam); + + JLabel label_3 = new JLabel("mindestens"); + label_3.setBounds(315, 191, 60, 20); + panel_2.add(label_3); + + JLabel lblMindestens = new JLabel("mindestens"); + lblMindestens.setBounds(315, 91, 60, 20); + panel_2.add(lblMindestens); + + JTextArea txtrBeispielWindows_1 = new JTextArea(); + txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); + txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrBeispielWindows_1.setBackground(SystemColor.menu); + txtrBeispielWindows_1.setBounds(10, 222, 280, 55); + panel_2.add(txtrBeispielWindows_1); + + JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); + lblNewLabel_3.setBounds(10, 91, 280, 20); + panel_2.add(lblNewLabel_3); + + JTextArea txtrHinweisSolltenSie = new JTextArea(); + txtrHinweisSolltenSie.setBackground(SystemColor.menu); + txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); + txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); + txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); + panel_2.add(txtrHinweisSolltenSie); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + EingabeImageTechnisch_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + if(rdbtnInternetJa.isSelected()==true) + { + Image.image.setInternet(true); + } + else + { + Image.image.setInternet(false); + } + + if(rdbtnlicenseJa.isSelected()==true) + { + Image.image.setLicensed(true); + } + else + { + Image.image.setLicensed(false); + } + Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); + Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); + + EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); + sr.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) { + if(rdbtnInternetJa.isSelected()==true) + { + Image.image.setInternet(true); + } + else + { + Image.image.setInternet(false); + } + + if(rdbtnlicenseJa.isSelected()==true) + { + Image.image.setLicensed(true); + } + else + { + Image.image.setLicensed(false); + } + Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); + Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); + FTPUploader_GUI ea=new FTPUploader_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(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/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java new file mode 100644 index 00000000..43f43e99 --- /dev/null +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -0,0 +1,370 @@ +package gui.image; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import java.io.File; + +import javax.swing.JButton; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; + +import ftp.DownloadTask; + +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.SystemColor; +import java.awt.Font; +import javax.swing.JTextPane; +import javax.swing.JSeparator; + +import models.Image; + +import org.apache.thrift.TException; + +import server.Server.Client; +import server.User; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { + + @SuppressWarnings("unused") + private JPanel contentPane; + private final JPanel contentPanel = new JPanel(); + JLabel lblNewLabel; + JLabel downspeed; + User user; + JProgressBar progressBar; + String host = "141.79.128.121"; + int port = 21; + String username = "openslx"; + String password = "openslx-ng"; + String downloadFile = ""; + static String arg = ""; + DownloadTask task; + JLabel bytesreadlbl; + JLabel lblNewLabel_3; + JLabel labelVerbleibend; + long filesize; + double speed; + long bytesread; + JLabel labelZeit; + boolean taskrun = false; + ThriftConnection thrift = new ThriftConnection(); + Client client = thrift.getThriftConnection(); + JButton buttonback = new JButton("Zur\u00FCck"); + + /** + * Launch the application. + */ + /* + * public static void main(String[] args) { EventQueue.invokeLater(new + * Runnable() { public void run() { try { FTPDownloader frame = new + * FTPDownloader(); frame.setVisible(true); } catch (Exception e) { + * e.printStackTrace(); } } }); } + */ + + /** + * Create the frame. + */ + public FTPDownloader_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + if (taskrun == true) { + try { + client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + task.cancel(true); + } + dispose(); + } + }); + setResizable(false); + // setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + + + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + setBackground(Color.WHITE); + setTitle("Dozentenmodul *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + getContentPane().setLayout(new BorderLayout()); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel, BorderLayout.CENTER); + contentPanel.setLayout(null); + { + JButton btnSpeicherortAuswhlen = new JButton( + "Speicherort ausw\u00E4hlen"); + btnSpeicherortAuswhlen.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + JFileChooser fc = new JFileChooser(); + fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + + fc.showOpenDialog(getParent()); + File dir = fc.getSelectedFile(); + lblNewLabel.setText(dir.getAbsolutePath()); + } + }); + + btnSpeicherortAuswhlen.setBounds(57, 124, 141, 23); + btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); + btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); + contentPanel.add(btnSpeicherortAuswhlen); + } + + lblNewLabel = new JLabel("C:\\"); + lblNewLabel.setBounds(208, 124, 238, 23); + contentPanel.add(lblNewLabel); + + JButton btnDownloadStarten = new JButton("Download starten"); + btnDownloadStarten.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + buttonDownloadActionPerformed(arg0); + } + }); + + btnDownloadStarten.setBounds(57, 168, 141, 23); + contentPanel.add(btnDownloadStarten); + + progressBar = new JProgressBar(0, 100); + progressBar.setStringPainted(true); + + progressBar.setBounds(57, 202, 497, 30); + contentPanel.add(progressBar); + + JLabel lblDownloadgeschwindigkeit = new JLabel( + "Downloadgeschwindigkeit:"); + lblDownloadgeschwindigkeit.setBounds(57, 243, 141, 14); + contentPanel.add(lblDownloadgeschwindigkeit); + + downspeed = new JLabel("0"); + downspeed.setBounds(308, 243, 95, 14); + contentPanel.add(downspeed); + + JLabel lblNewLabel_1 = new JLabel("Fertig:"); + lblNewLabel_1.setBounds(57, 293, 46, 14); + contentPanel.add(lblNewLabel_1); + + bytesreadlbl = new JLabel(""); + bytesreadlbl.setBounds(66, 244, 108, 14); + contentPanel.add(bytesreadlbl); + + JLabel lblNewLabel_2 = new JLabel("von:"); + lblNewLabel_2.setBounds(226, 293, 46, 14); + contentPanel.add(lblNewLabel_2); + + lblNewLabel_3 = new JLabel(""); + lblNewLabel_3.setBounds(235, 244, 108, 14); + contentPanel.add(lblNewLabel_3); + + JLabel lblMbVerbleibend = new JLabel("Verbleibend:"); + lblMbVerbleibend.setBounds(57, 318, 71, 14); + contentPanel.add(lblMbVerbleibend); + + labelVerbleibend = new JLabel(""); + labelVerbleibend.setBounds(91, 269, 108, 14); + contentPanel.add(labelVerbleibend); + + JLabel lblGeschtzteVerbleibendeZeit = new JLabel( + "Gesch\u00E4tzte Verbleibende Zeit:"); + lblGeschtzteVerbleibendeZeit.setBounds(57, 268, 150, 14); + contentPanel.add(lblGeschtzteVerbleibendeZeit); + + labelZeit = new JLabel(""); + labelZeit.setBounds(261, 219, 117, 14); + contentPanel.add(labelZeit); + + JPanel panel = new JPanel(); + panel.setLayout(null); + panel.setBackground(SystemColor.menu); + 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); + + 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); + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 79, 597, 2); + contentPanel.add(separator); + + JLabel label_1 = new JLabel("Hauptmen\u00FC"); + label_1.setForeground(Color.BLUE); + label_1.setBounds(20, 88, 61, 20); + contentPanel.add(label_1); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(80, 91, 14, 14); + contentPanel.add(label_2); + + JLabel label_3 = new JLabel("VL-Image"); + label_3.setForeground(Color.BLUE); + label_3.setBounds(91, 88, 46, 20); + contentPanel.add(label_3); + + JLabel label_4 = new JLabel(">"); + label_4.setBounds(139, 91, 14, 14); + contentPanel.add(label_4); + + JLabel label_5 = new JLabel("Neu/Bearbeiten"); + label_5.setBounds(149, 91, 108, 14); + contentPanel.add(label_5); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(-10, 648, 597, 2); + contentPanel.add(separator_1); + + JLabel label_6 = new JLabel("1."); + label_6.setBounds(24, 128, 23, 14); + contentPanel.add(label_6); + + JLabel label_7 = new JLabel("2."); + label_7.setBounds(24, 172, 23, 14); + contentPanel.add(label_7); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBackground(UIManager.getColor("Button.background")); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane, BorderLayout.SOUTH); + { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (taskrun == true) { + task.cancel(true); + try { + client.DeleteFtpUser(user.userName); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); + dispose(); + } + }); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); + } + } + setVisible(true); + + } + + private void buttonDownloadActionPerformed(ActionEvent event) { + + progressBar.setValue(0); + + try { + user = client.getFtpUser(); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + task = new DownloadTask(host, port, user.userName, user.password, + downloadFile, lblNewLabel.getText(), this); + task.addPropertyChangeListener(this); + task.execute(); + taskrun = true; + + } + + public void propertyChange(PropertyChangeEvent arg0) { + + int progress = 0; + if ("progress" == arg0.getPropertyName()) { + progress = (Integer) arg0.getNewValue(); + progressBar.setValue(progress); + if (progress == 100) { + buttonback.setEnabled(true); + } + } + + if ("speed" == arg0.getPropertyName()) { + speed = (double) arg0.getNewValue(); + // if(speed<=1){ + + downspeed.setText(String.valueOf(speed).substring(0, + String.valueOf(speed).lastIndexOf(".") + 3) + + " MB/s"); + + // }else + // { + // double MBSpeed=speed/1024; + // downspeed.setText(String.valueOf((MBSpeed)).substring(0, + // String.valueOf(MBSpeed).indexOf("."))); + // } + + } + if ("bytesread" == arg0.getPropertyName()) { + bytesread = (long) arg0.getNewValue(); + bytesreadlbl.setText((bytesread / 1024 / 1024) + " MB"); + labelVerbleibend + .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + + " MB"); + + labelZeit + .setText(String + .valueOf( + ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) + .substring( + 0, + String.valueOf( + (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + .lastIndexOf(".")) + + " Minuten"); + + } + if ("filesize" == arg0.getPropertyName()) { + filesize = (long) arg0.getNewValue(); + lblNewLabel_3.setText((filesize / 1024 / 1024) + " MB"); + + } + + } +} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java new file mode 100644 index 00000000..c8a23428 --- /dev/null +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -0,0 +1,428 @@ +package gui.image; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.EventQueue; +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.WindowAdapter; +import java.awt.event.WindowEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +import javax.swing.JButton; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JSeparator; +import javax.swing.JTextPane; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import models.Image; +import models.person; +//import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; +import ftp.UploadTask; +import gui.intro.MainMenue_GUI; + + +@SuppressWarnings("serial") +public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListener { + + @SuppressWarnings("unused") + private JPanel contentPane; + private final JPanel contentPanel = new JPanel(); + JLabel lblNewLabel; + JProgressBar progressBar; + String host="141.79.128.121"; + int port=21; + server.User user; + String filename=""; + File uploadFile; + static String arg=""; + UploadTask task; + JLabel UpSpeed; + JLabel labelfertig; + JLabel labelfilesize; + JLabel labelZeit; + JLabel labelverbleibend; + long filesize; + double speed; + long bytesread; + boolean taskrun=false; + ThriftConnection thrift=new ThriftConnection(); + Client client=thrift.getThriftConnection(); + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + FTPEditUploader_GUI frame = new FTPEditUploader_GUI(); + frame.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the frame. + */ + public FTPEditUploader_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + if(taskrun==true) + { + try { + + client.DeleteFtpUser(user.userName); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + task.cancel(true); + } + } + }); + setResizable(false); + //setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + + + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + //filename=name; + setBackground(Color.WHITE); + setTitle("Dozentenmodul *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 250); + getContentPane().setLayout(new BorderLayout()); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel, BorderLayout.CENTER); + contentPanel.setLayout(null); + { + JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen"); + btnSpeicherortAuswhlen.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + JFileChooser fc=new JFileChooser(); + fc.setFileSelectionMode(JFileChooser.FILES_ONLY); + + fc.showOpenDialog(getParent()); + File dir=fc.getSelectedFile(); + uploadFile=dir; + filename=uploadFile.getName(); + lblNewLabel.setText(dir.getAbsolutePath()); + } + }); + + btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23); + btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); + btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); + contentPanel.add(btnSpeicherortAuswhlen); + } + + lblNewLabel = new JLabel(""); + lblNewLabel.setBounds(184, 124, 255, 23); + contentPanel.add(lblNewLabel); + + JButton btnDownloadStarten = new JButton("Upload starten"); + btnDownloadStarten.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + buttonUploadActionPerformed(arg0); + + } + }); + + btnDownloadStarten.setBounds(10, 330, 141, 23); + contentPanel.add(btnDownloadStarten); + + progressBar = new JProgressBar(0,100); + progressBar.setStringPainted(true); + + + progressBar.setBounds(10, 158, 577, 30); + contentPanel.add(progressBar); + + JLabel label = new JLabel("Downloadgeschwindigkeit:"); + label.setBounds(10, 199, 141, 14); + contentPanel.add(label); + + JLabel label_1 = new JLabel("Fertig:"); + label_1.setBounds(10, 249, 46, 14); + contentPanel.add(label_1); + + labelfertig = new JLabel("0"); + labelfertig.setBounds(66, 249, 108, 14); + contentPanel.add(labelfertig); + + UpSpeed = new JLabel("0"); + UpSpeed.setBounds(329, 199, 95, 14); + contentPanel.add(UpSpeed); + + JLabel label_4 = new JLabel("von:"); + label_4.setBounds(184, 249, 46, 14); + contentPanel.add(label_4); + + labelfilesize = new JLabel("0"); + labelfilesize.setBounds(240, 249, 108, 14); + contentPanel.add(labelfilesize); + + JLabel label_6 = new JLabel("Verbleibend:"); + label_6.setBounds(10, 274, 71, 14); + contentPanel.add(label_6); + + JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); + label_7.setBounds(10, 224, 150, 14); + contentPanel.add(label_7); + + labelZeit = new JLabel("0"); + labelZeit.setBounds(329, 224, 117, 14); + contentPanel.add(labelZeit); + + labelverbleibend = new JLabel("0"); + labelverbleibend.setBounds(91, 274, 108, 14); + contentPanel.add(labelverbleibend); + + JPanel panel = new JPanel(); + panel.setLayout(null); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + contentPanel.add(panel); + + JLabel label_2 = new JLabel("Eingabe Ihrer Daten"); + label_2.setFont(new Font("Tahoma", Font.BOLD, 18)); + label_2.setBounds(10, 11, 509, 22); + panel.add(label_2); + + 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); + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 79, 597, 2); + contentPanel.add(separator); + + JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); + lblNewLabel_1.setForeground(Color.BLUE); + lblNewLabel_1.setBounds(20, 88, 61, 20); + contentPanel.add(lblNewLabel_1); + + JLabel label_3 = new JLabel(">"); + label_3.setBounds(80, 91, 14, 14); + contentPanel.add(label_3); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(91, 88, 46, 20); + contentPanel.add(lblVlimage); + + JLabel label_5 = new JLabel(">"); + label_5.setBounds(139, 91, 14, 14); + contentPanel.add(label_5); + + JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten"); + lblNeubearbeiten.setBounds(149, 91, 108, 14); + contentPanel.add(lblNeubearbeiten); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + contentPanel.add(separator_1); + + JButton btnCopyFileTo = new JButton("Copy File to Prod"); + btnCopyFileTo.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + client.startFileCopy(user.path+"/"+uploadFile.getName()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + }); + btnCopyFileTo.setBounds(10, 375, 264, 23); + contentPanel.add(btnCopyFileTo); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBackground(UIManager.getColor("Button.background")); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane, BorderLayout.SOUTH); + { + JButton ButtonReady = new JButton("Abschlie\u00DFen"); + ButtonReady.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + updateData(); + dispose(); + MainMenue_GUI m=new MainMenue_GUI(); + m.setVisible(true); + + if(taskrun==true) + { + try { + client.DeleteFtpUser(user.userName); + + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + task.cancel(true); + } + thrift.closeThriftConnection(); + } + }); + + JButton buttonCancel = new JButton("Schlie\u00DFen"); + buttonCancel.setActionCommand("Cancel"); + buttonPane.add(buttonCancel); + ButtonReady.setActionCommand("Cancel"); + buttonPane.add(ButtonReady); + } + } + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnHillfe = new JMenu("Hillfe"); + menuBar.add(mnHillfe); + setVisible(true); + + } + + private void buttonUploadActionPerformed(ActionEvent event) { + // File (or directory) with old name + // File file = new File(lblNewLabel.getText()); + + // File (or directory) with new name + //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk"); + //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk"); + + + // Rename file (or directory) + //boolean success = file.renameTo(file2); + //if (!success) { + // File was not successfully renamed + //System.out.println("Not OK"); + //} + //else + //{ + //System.out.println("OK"); + //} + progressBar.setValue(0); + + try { + user=client.getFtpUser(); + System.out.println("name"+user.userName); + System.out.println("path"+user.path); + System.out.println("pass"+user.password); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); + task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); + + task.addPropertyChangeListener(this); + task.execute(); + taskrun=true; + + //createXML(); + //TransferToSatellit(); + + + } + + public void propertyChange(PropertyChangeEvent arg0) { + if ("progress" == arg0.getPropertyName()) { + int progress = (Integer) arg0.getNewValue(); + progressBar.setValue(progress); + } + if("speed"==arg0.getPropertyName()){ + speed=(double)arg0.getNewValue(); + //if(speed<=1){ + + UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s"); + + // }else + //{ + //double MBSpeed=speed/1024; + //downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf("."))); + //} + + } + if("bytesread"==arg0.getPropertyName()) + { + bytesread=(long)arg0.getNewValue(); + labelfertig.setText((bytesread/1024/1024)+" MB"); + labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB"); + + + labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten"); + + + } + if("filesize"==arg0.getPropertyName()) + { + filesize=(long)arg0.getNewValue(); + labelfilesize.setText((filesize/1024/1024)+" MB"); + + } + + } + + public boolean updateData(){ + + try { + + + System.out.println("Start Update"); + client.updateImageData(Image.image.getImagename(),Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(),Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return false; + } + return true; + + + } +} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/image/FTPUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPUploader_GUI.java new file mode 100644 index 00000000..250347b0 --- /dev/null +++ b/Dozentenmodul/src/gui/image/FTPUploader_GUI.java @@ -0,0 +1,483 @@ +package gui.image; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.EventQueue; +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.WindowAdapter; +import java.awt.event.WindowEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import javax.swing.JButton; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JSeparator; +import javax.swing.JTextPane; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import models.Image; +import models.person; +import org.apache.thrift.TException; +import server.Server.Client; +import thrift.ThriftConnection; +//import util.XMLCreator; +import ftp.UploadTask; +import gui.intro.MainMenue_GUI; + +@SuppressWarnings("serial") +public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { + + @SuppressWarnings("unused") + private JPanel contentPane; + private final JPanel contentPanel = new JPanel(); + JLabel lblNewLabel; + JProgressBar progressBar; + String host = "141.79.128.121"; + int port = 21; + server.User user; + String filename = ""; + File uploadFile; + static String arg = ""; + UploadTask task; + JLabel UpSpeed; + JLabel labelfertig; + JLabel labelfilesize; + JLabel labelZeit; + JLabel labelverbleibend; + long filesize; + double speed; + long bytesread; + boolean taskrun = false; + ThriftConnection thrift = new ThriftConnection(); + Client client = thrift.getThriftConnection(); + JButton finishButton = new JButton("Fertigstellen"); + JButton btnUploadStarten = new JButton("Upload auf Server starten"); + JButton btnZurck = new JButton("Zur\u00FCck"); + int progress = 0; // progress of upload + + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + FTPUploader_GUI frame = new FTPUploader_GUI(); + frame.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the frame. + */ + public FTPUploader_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + if (taskrun == true) { + try { + + client.DeleteFtpUser(user.userName); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + task.cancel(true); + } + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + // filename=name; + setBackground(Color.WHITE); + setTitle("Dozentenmodul *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + // setBounds(100, 100, 603, 250); + getContentPane().setLayout(new BorderLayout()); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel, BorderLayout.CENTER); + contentPanel.setLayout(null); + { + JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); + btnSpeicherortAuswhlen.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + JFileChooser fc = new JFileChooser(); + fc.setFileSelectionMode(JFileChooser.FILES_ONLY); + + fc.showOpenDialog(getParent()); + File file = fc.getSelectedFile(); + // check if a file is selected and exists + if (file != null) { + System.out.println("File to upload exists"); + uploadFile = file; + filename = uploadFile.getName(); + lblNewLabel.setText(file.getAbsolutePath()); + } else { + System.out.println("No file selected"); + lblNewLabel.setText(""); + }// end if + } + }); + + btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23); + btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); + contentPanel.add(btnSpeicherortAuswhlen); + } + + lblNewLabel = new JLabel(""); + lblNewLabel.addPropertyChangeListener(new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent arg0) { + if (lblNewLabel.getText().isEmpty()) { + // wenn leer, dann upload button nicht freigeben + btnUploadStarten.setEnabled(false); + } else { + // wenn leer, dann upload button nicht freigeben + btnUploadStarten.setEnabled(true); + } + } + }); + lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); + lblNewLabel.setBounds(285, 124, 302, 23); + contentPanel.add(lblNewLabel); + + btnUploadStarten.setEnabled(false); + btnUploadStarten.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + buttonUploadActionPerformed(arg0); + + } + }); + + btnUploadStarten.setBounds(102, 168, 173, 23); + contentPanel.add(btnUploadStarten); + + progressBar = new JProgressBar(0, 100); + progressBar.setStringPainted(true); + + progressBar.setBounds(102, 202, 485, 30); + contentPanel.add(progressBar); + + JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:"); + lblUploadgeschwindigkeit.setBounds(102, 243, 141, 14); + contentPanel.add(lblUploadgeschwindigkeit); + + JLabel label_1 = new JLabel("Fertig:"); + label_1.setBounds(102, 293, 46, 14); + contentPanel.add(label_1); + + labelfertig = new JLabel("0"); + labelfertig.setHorizontalAlignment(SwingConstants.LEFT); + labelfertig.setBounds(183, 293, 108, 14); + contentPanel.add(labelfertig); + + UpSpeed = new JLabel("0"); + UpSpeed.setHorizontalAlignment(SwingConstants.LEFT); + UpSpeed.setBounds(374, 243, 117, 14); + contentPanel.add(UpSpeed); + + JLabel label_4 = new JLabel("von:"); + label_4.setBounds(318, 293, 46, 14); + contentPanel.add(label_4); + + labelfilesize = new JLabel("0"); + labelfilesize.setHorizontalAlignment(SwingConstants.LEFT); + labelfilesize.setBounds(374, 293, 117, 14); + contentPanel.add(labelfilesize); + + JLabel label_6 = new JLabel("Verbleibend:"); + label_6.setBounds(102, 318, 71, 14); + contentPanel.add(label_6); + + JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); + label_7.setBounds(102, 268, 150, 14); + contentPanel.add(label_7); + + labelZeit = new JLabel("0"); + labelZeit.setHorizontalAlignment(SwingConstants.LEFT); + labelZeit.setBounds(374, 268, 117, 14); + contentPanel.add(labelZeit); + + labelverbleibend = new JLabel("0"); + labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT); + labelverbleibend.setBounds(183, 318, 108, 14); + contentPanel.add(labelverbleibend); + + JPanel panel = new JPanel(); + panel.setLayout(null); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + contentPanel.add(panel); + + JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image"); + lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18)); + lblUploadIhresImage.setBounds(10, 11, 509, 22); + panel.add(lblUploadIhresImage); + + JTextPane txtpnFhreSieBitte = new JTextPane(); + txtpnFhreSieBitte + .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); + txtpnFhreSieBitte.setEditable(false); + txtpnFhreSieBitte.setBackground(SystemColor.menu); + txtpnFhreSieBitte.setBounds(10, 36, 509, 32); + panel.add(txtpnFhreSieBitte); + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 79, 597, 2); + contentPanel.add(separator); + + JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); + lblNewLabel_1.setForeground(Color.BLUE); + lblNewLabel_1.setBounds(20, 88, 61, 20); + contentPanel.add(lblNewLabel_1); + + JLabel label_3 = new JLabel(">"); + label_3.setBounds(80, 91, 14, 14); + contentPanel.add(label_3); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(91, 88, 46, 20); + contentPanel.add(lblVlimage); + + JLabel label_5 = new JLabel(">"); + label_5.setBounds(139, 91, 14, 14); + contentPanel.add(label_5); + + JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten"); + lblNeubearbeiten.setBounds(149, 91, 108, 14); + contentPanel.add(lblNeubearbeiten); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + contentPanel.add(separator_1); + + JButton btnCopyFileTo = new JButton("Copy File to Prod"); + btnCopyFileTo.setEnabled(false); + btnCopyFileTo.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + System.out.println("Copying file to " + user.path + "/" + + uploadFile.getName()); + client.startFileCopy(user.path + "/" + uploadFile.getName()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + }); + btnCopyFileTo.setBounds(102, 343, 173, 23); + contentPanel.add(btnCopyFileTo); + + JLabel lblShritt = new JLabel("Schritt 1:"); + lblShritt.setBounds(24, 128, 57, 14); + contentPanel.add(lblShritt); + + JLabel lblSchritt = new JLabel("Schritt 2:"); + lblSchritt.setBounds(24, 172, 57, 14); + contentPanel.add(lblSchritt); + + JLabel lblSchritt_1 = new JLabel("Schritt 3:"); + lblSchritt_1.setBounds(20, 391, 57, 14); + contentPanel.add(lblSchritt_1); + + JLabel lblKlickenSieAuf = new JLabel( + "Klicken Sie auf \"Fertigstellen\"."); + lblKlickenSieAuf.setBounds(98, 391, 241, 14); + contentPanel.add(lblKlickenSieAuf); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBackground(UIManager.getColor("Button.background")); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane, BorderLayout.SOUTH); + { + finishButton.setEnabled(false); + finishButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + writeData(); + dispose(); + MainMenue_GUI m = new MainMenue_GUI(); + m.setVisible(true); + if (taskrun == true) { + try { + client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + task.cancel(true); + } + + } + }); + + btnZurck.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dispose(); + EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI(); + m.setVisible(true); + } + }); + btnZurck.setActionCommand("Cancel"); + buttonPane.add(btnZurck); + finishButton.setActionCommand("Cancel"); + buttonPane.add(finishButton); + } + } + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnHillfe = new JMenu("Hillfe"); + menuBar.add(mnHillfe); + setVisible(true); + + } + + private void buttonUploadActionPerformed(ActionEvent event) { + + progressBar.setValue(0); + btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick + // und + + try { + user = client.getFtpUser(); + System.out.println("name" + user.userName); + System.out.println("path" + user.path); + System.out.println("pass" + user.password); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + + System.out.println(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); + Image.image.setNewName(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); + task = new UploadTask(host, port, user.userName, user.password, + user.path, uploadFile); + + task.addPropertyChangeListener(this); + task.execute(); + taskrun = true; + + } + + public void propertyChange(PropertyChangeEvent arg0) { + progress = 0; + if ("progress" == arg0.getPropertyName()) { + progress = (Integer) arg0.getNewValue(); + progressBar.setValue(progress); + + // Button zum Fertigstellen freischalten, wenn 100% erreicht sind + if (progress == 100) { + finishButton.setEnabled(true); + + } + if (progress == 0 || progress == 100) { + // not uploading currently + btnZurck.setEnabled(true); + } else { + // currently uploading, don't let user interact + btnZurck.setEnabled(false); + } + + } + + if ("speed" == arg0.getPropertyName()) { + speed = (double) arg0.getNewValue(); + // if(speed<=1){ + + UpSpeed.setText(String.valueOf(speed).substring(0, + String.valueOf(speed).lastIndexOf(".") + 3) + + " MB/s"); + + } + if ("bytesread" == arg0.getPropertyName()) { + bytesread = (long) arg0.getNewValue(); + labelfertig.setText((bytesread / 1024 / 1024) + " MB"); + labelverbleibend + .setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + + " MB"); + + labelZeit + .setText(String + .valueOf( + ((((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + 1) + .substring( + 0, + String.valueOf( + (((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) / speed) / 60) + .lastIndexOf(".")) + + " Minuten"); + + } + if ("filesize" == arg0.getPropertyName()) { + filesize = (long) arg0.getNewValue(); + labelfilesize.setText((filesize / 1024 / 1024) + " MB"); + + } + + } + + public boolean writeData() { + + try { + + client.writeVLdata(Image.image.getImagename(), + person.verantwortlicher.getVorname(), + person.verantwortlicher.getName(), + person.verantwortlicher.getHochschule(), + person.verantwortlicher.getEMail(), + person.verantwortlicher.getTel(), + person.verantwortlicher.getFakultät(), + Image.image.isLicensed(), Image.image.isInternet(), + Image.image.getRam(), Image.image.getCpu(), + "/srv/openslx/nfs/temp/" + Image.image.getNewName()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return false; + } + return true; + + } +} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java new file mode 100644 index 00000000..b7f661b5 --- /dev/null +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -0,0 +1,514 @@ +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.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.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; +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.Image; +import models.person; +//import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchEditImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + JTable tablemyImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + 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 rowSorterAll = new TableRowSorter( + modelAll); + final TableRowSorter rowSorterMyImages = new TableRowSorter( + 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. + */ + public SearchEditImage_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*"); + // 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 VL-Image"); + 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); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + 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)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + + } + } + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "Erweiterte Suche"); + 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); + + comboBox = new JComboBox(); + try { + // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List list = client.getAllOS(); + // Leeres Item hinzufügen + comboBox.addItem(""); + for (int i = 0; i < list.size(); i++) { + // Hinzufügen der verfügbaren Betriebssysteme + comboBox.addItem(list.get(i)); + } + } catch (TException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + // 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)); + } + } + + }); + 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ü + con.closeThriftConnection(); + SearchEditImage_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("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) { + + 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.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.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(); + 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 Images", null, scrollPaneCoopImages, + null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable 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(); + JTable 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); + + JButton btnDownload = new JButton("Download"); + btnDownload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + // Öffnet den Downloader + + if (tablemyImages.getSelectedRow() != -1) { + String imageid = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchEditImage_GUI.this.setVisible(false); + FTPDownloader_GUI down = new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + } else { + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein Image für den Download aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } + } + }); + btnDownload.setBounds(449, 508, 118, 23); + contentPanel.add(btnDownload); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + 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(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + con.closeThriftConnection(); + + // Image.image.setImageId(imageid); + if (tabbedPane.getSelectedIndex() == 0) { + 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); + con.closeThriftConnection(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); + ea.setVisible(true); + dispose(); + } else { + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein eigenes Image aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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 images; + try { + // Hole eine Liste der Images + images = client.getImageList(); + + Iterator i = images.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + images.get(x).getUpdateTime(), "", 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(); + } + return model; + } + +} diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java new file mode 100644 index 00000000..493230d3 --- /dev/null +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -0,0 +1,459 @@ +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.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.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.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 org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + JTable tablemyImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + "Verantwortlicher", "Letztes Update", "Schlagwort" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final TableRowSorter rowSorterAll = new TableRowSorter( + modelAll); + final TableRowSorter rowSorterMyImages = new TableRowSorter( + modelMyImages); + + /** + * 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. + */ + public SearchImage_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + // Beendet die Anwendung nach klick auf X + 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*"); + // 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 VL-Image"); + 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); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + 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)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + + } + } + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "Erweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Fenster Extended GUI + 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(); + try { + // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List list = client.getAllOS(); + // Leeres Item hinzufügen + comboBox.addItem(""); + for (int i = 0; i < list.size(); i++) { + // Hinzufügen der verfügbaren Betriebssysteme + comboBox.addItem(list.get(i)); + } + } catch (TException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + // 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)); + } + } + + }); + 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ü + SearchImage_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("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); + } + + } + }); + + 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(); + 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); + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages = new JTable(); + 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 Images", null, scrollPaneCoopImages, + null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable 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(); + JTable 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); + + JButton btnDownload = new JButton("Download"); + 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); + } + }); + btnDownload.setBounds(449, 508, 118, 23); + contentPanel.add(btnDownload); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // Öffnet das Hauptmenü + 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); + } + } + + 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 images; + try { + // Hole eine Liste der Images + + images = client.getImageList(); + Iterator i = images.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + images.get(x).getUpdateTime() }; + // Füge diese Objekte der Tabelle hinzu + 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/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java new file mode 100644 index 00000000..e4f37871 --- /dev/null +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -0,0 +1,193 @@ +package gui.intro; + + +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.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.IOException; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +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.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextPane; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.ini4j.InvalidFileFormatException; +import org.ini4j.Wini; + + + +@SuppressWarnings("serial") +public class BillOfRights_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JButton fwdButton; + JCheckBox chckbxAkzeptieren; + + /** + * Create the dialog. + */ + public BillOfRights_GUI() { + setResizable(false); + + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet das Programm beim Klick auf das X + System.exit(0); + } + }); + try { + //Setzt das Look & Feel auf das 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*"); + + //Zentiert das Fenster in der Bildschirmmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 567, 60); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Hinweis"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 95, 567, 485); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JTextArea txtrLoremIpsumDolor = new JTextArea(); + txtrLoremIpsumDolor.setWrapStyleWord(true); + txtrLoremIpsumDolor.setLineWrap(true); + txtrLoremIpsumDolor.setEditable(false); + JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor); + scr.setBounds(0, 0, 567, 477); + txtrLoremIpsumDolor.setBounds(0, 0, 567, 477); + txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo"); + + contentPanel.add(scr); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 630, 587, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + fwdButton = new JButton("Weiter"); + fwdButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + ini.put("main", "BillOfRights",true); + ini.store(); + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + VmWareLink_GUI ac=new VmWareLink_GUI(); + ac.setVisible(true); + dispose(); + } + }); + fwdButton.setEnabled(false); + + buttonPane.add(fwdButton); + } + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 617, 587, 2); + getContentPane().add(separator); + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 82, 587, 2); + getContentPane().add(separator); + } + + chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen."); + chckbxAkzeptieren.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + //Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht + if(chckbxAkzeptieren.isSelected()==true) + { + + fwdButton.setEnabled(true); + + } + else + { + + } + } + }); + chckbxAkzeptieren.setBackground(SystemColor.menu); + chckbxAkzeptieren.setBounds(10, 587, 567, 23); + getContentPane().add(chckbxAkzeptieren); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER); + 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/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java new file mode 100644 index 00000000..586b8d13 --- /dev/null +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -0,0 +1,252 @@ +package gui.intro; + + +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.Image; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.IOException; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JTextField; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import models.person; +import org.apache.thrift.TException; +import org.ini4j.Wini; +import thrift.MasterThriftConnection; +import thrift.ImageServer.Client; +import thrift.UserInfo; + +import config.config_file; + +@SuppressWarnings("serial") +public class Login_GUI extends JFrame { + + private JPanel contentPane; + private JTextField username; + private JPasswordField pass; + + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + // Prüfe und Erzeuge gegebenfalls Config + config_file cf = new config_file(); + boolean conf = cf.createConfig(); + if (conf == true) { + // Aufruf und Anzeige des Login Fensters + Login_GUI frame = new Login_GUI(); + frame.setVisible(true); + } else { + JOptionPane.showMessageDialog(null, + "Fehler beim erzeugen der Konfigurationsfile", + "Message", JOptionPane.ERROR_MESSAGE); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the frame. + */ + public Login_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + + // Fenster darf nicht vergrößert werden + setResizable(false); + try { + // Setzt das Look and Feel auf System + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // Titel des Fensters setzen + setTitle("Dozentenmodul *Prototyp*"); + // Aktion die beim Schließen durchgeführt werden soll + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + // Größe des Fensters definieren + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 400) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 400); + // Erzeugen eines Panels + contentPane = new JPanel(); + // Hintergrund Farbe des Panels setzen + contentPane.setBackground(SystemColor.menu); + // Rahmen des Fensters setzen + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + setContentPane(contentPane); + // Layout setzen + contentPane.setLayout(null); + // Label für das Logo erzeugen + JLabel imgLabel = new JLabel(); + // Größe und Position des Logos festelegen + imgLabel.setBounds(150, 11, 350, 142); + // Pfadangabe des Logos + + ImageIcon icon = new ImageIcon(getClass().getResource( + "/Logo_bwLehrpool.png"), "Logo"); + // Skalierung des Logos + Image scaled = icon.getImage().getScaledInstance(270, 64, 0); + imgLabel.setIcon(new ImageIcon(scaled)); + // Hinzufügen des Logos in das Fenster + contentPane.add(imgLabel); + + // Erzeugen und Hinzufügen des Labels + JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); + LabelUser.setBounds(111, 164, 134, 20); + 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() { + public void actionPerformed(ActionEvent arg0) { + performLogin(); + } + }); + username.setBounds(304, 164, 196, 20); + contentPane.add(username); + username.setColumns(10); + + // Erzeugen und Hinzufügen des Labels + JLabel LabelPass = new JLabel("bwIDM-Passwort:"); + LabelPass.setBounds(111, 195, 134, 20); + contentPane.add(LabelPass); + + // Erzeugen, Hinzufügen und definierung der Aktion des Buttons + JButton BtnLogin = new JButton("Login"); + BtnLogin.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + performLogin(); + }// end actionPerformed + }); + + BtnLogin.setBounds(304, 244, 196, 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() { + public void actionPerformed(ActionEvent e) { + performLogin(); + } + }); + pass.setBounds(304, 195, 196, 20); + contentPane.add(pass); + }// end LoginGUI() + + //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; + try { + String passText = new String(pass.getPassword()); + System.out.println(username.getText() + " " + passText); + result = client.authenticate(username.getText(), passText); + + } catch (thrift.AuthenticationException e) { + System.out.println("Authentifizierung fehlgeschlagen: " + e.message); + JOptionPane.showMessageDialog(null, + "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", + "Anmeldung fehlgeschlagen", + JOptionPane.ERROR_MESSAGE); + + return; + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + 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(); + } + + } else { + JOptionPane.showMessageDialog(null, "Login denied!", "Message", + JOptionPane.INFORMATION_MESSAGE); + } + }// end performLogin + +}// end class diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java new file mode 100644 index 00000000..5f9c2ad5 --- /dev/null +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -0,0 +1,450 @@ +package gui.intro; + +import gui.image.DeleteImage_GUI; +import gui.image.EingabeImageAllgemein_GUI; +import gui.image.SearchEditImage_GUI; +import gui.lecture.EingabeLectureAllgemein_GUI; +import gui.lecture.SearchEditLecture_GUI; +import gui.lecture.SearchMethodLecture_GUI; + +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import java.awt.Color; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JRadioButton; +import javax.swing.SwingConstants; +import javax.swing.ButtonGroup; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.ToolTipManager; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.border.TitledBorder; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.ScrollPane; +import javax.swing.JTextArea; +import javax.swing.ImageIcon; + +@SuppressWarnings("serial") +public class MainMenue_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + String descNewImage, descEditImage, descDeleteImage, descSearchImage, + descNewLecture, descEditLecture, descDeleteLecture, + descSearchLecture = ""; + JRadioButton rdbtnImageNew; + JRadioButton rdbtnImageEdit; + JRadioButton rdbtnImageSearchDownload; + JRadioButton rdbtnVeranstaltungNew; + JRadioButton rdbtnImageDelete; + JRadioButton rdbtnVeranstaltungEdit; + private final ButtonGroup buttonGroup = new ButtonGroup(); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + MainMenue_GUI dialog = new MainMenue_GUI(); + dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + }// end main + + /** + * Create the dialog. + */ + public MainMenue_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + // setBounds(100, 100, 545, 366); + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 567, 69); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Hauptmen\u00FC"); + 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("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 104, 567, 502); + contentPanel.setBackground(SystemColor.menu); + + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panelImage = new JPanel(); + panelImage.setBackground(SystemColor.menu); + panelImage.setBorder(new TitledBorder(null, "VL-Image", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panelImage.setBounds(10, 146, 270, 170); + contentPanel.add(panelImage); + panelImage.setLayout(null); + + rdbtnImageNew = new JRadioButton("Neu"); + rdbtnImageNew + .setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden"); + rdbtnImageNew.setBounds(6, 22, 159, 23); + panelImage.add(rdbtnImageNew); + rdbtnImageNew.setSelected(true); + buttonGroup.add(rdbtnImageNew); + rdbtnImageNew.setBackground(SystemColor.menu); + + rdbtnImageEdit = new JRadioButton("Bearbeiten"); + rdbtnImageEdit + .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); + rdbtnImageEdit.setBounds(6, 48, 185, 23); + panelImage.add(rdbtnImageEdit); + buttonGroup.add(rdbtnImageEdit); + rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT); + rdbtnImageEdit.setBackground(SystemColor.menu); + + rdbtnImageDelete = new JRadioButton("L\u00F6schen"); + rdbtnImageDelete.setEnabled(false); + buttonGroup.add(rdbtnImageDelete); + rdbtnImageDelete + .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); + rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT); + rdbtnImageDelete.setBackground(SystemColor.menu); + rdbtnImageDelete.setBounds(6, 74, 185, 23); + 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"); + rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT); + rdbtnImageSearchDownload.setBackground(SystemColor.menu); + rdbtnImageSearchDownload.setBounds(6, 100, 185, 23); + panelImage.add(rdbtnImageSearchDownload); + + JPanel panelDesc = new JPanel(); + panelDesc.setLayout(null); + panelDesc.setBorder(new TitledBorder(UIManager + .getBorder("TitledBorder.border"), "Erklärung", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panelDesc.setBackground(SystemColor.menu); + panelDesc.setBounds(290, 146, 270, 170); + contentPanel.add(panelDesc); + + ScrollPane scrollPaneDesc = new ScrollPane(); + scrollPaneDesc.setBounds(10, 15, 250, 145); + final JTextArea txtDesc = new JTextArea(); + txtDesc.setLineWrap(true); + txtDesc.setWrapStyleWord(true); + txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtDesc.setBackground(SystemColor.menu); + scrollPaneDesc.add(txtDesc); + // Pro AUswahl + txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."); + panelDesc.add(scrollPaneDesc); + + JPanel panelVeranstaltung = new JPanel(); + panelVeranstaltung.setLayout(null); + panelVeranstaltung.setBorder(new TitledBorder(UIManager + .getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panelVeranstaltung.setBackground(SystemColor.menu); + panelVeranstaltung.setBounds(10, 327, 270, 170); + contentPanel.add(panelVeranstaltung); + + rdbtnVeranstaltungNew = new JRadioButton("Neu"); + buttonGroup.add(rdbtnVeranstaltungNew); + rdbtnVeranstaltungNew + .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); + rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23); + panelVeranstaltung.add(rdbtnVeranstaltungNew); + rdbtnVeranstaltungNew.setBackground(SystemColor.menu); + + rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten"); + rdbtnVeranstaltungEdit + .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 + .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 + .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); + rdbtnVeranstaltungSearch.setBackground(SystemColor.menu); + rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23); + panelVeranstaltung.add(rdbtnVeranstaltungSearch); + + JLabel lblCrumbStart = new JLabel("Startseite"); + lblCrumbStart.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + Login_GUI lw = new Login_GUI(); + lw.setVisible(true); + MainMenue_GUI.this.setVisible(false); + } + }); + lblCrumbStart.setForeground(Color.BLUE); + lblCrumbStart.setBounds(10, 0, 52, 14); + contentPanel.add(lblCrumbStart); + + JLabel label = new JLabel(">"); + label.setBounds(60, 0, 13, 14); + contentPanel.add(label); + + JLabel lblRechtshinweis = new JLabel("Rechtshinweis"); + lblRechtshinweis.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + BillOfRights_GUI rb = new BillOfRights_GUI(); + rb.setVisible(true); + MainMenue_GUI.this.setVisible(false); + } + }); + lblRechtshinweis.setForeground(Color.BLUE); + lblRechtshinweis.setBounds(72, 0, 68, 14); + contentPanel.add(lblRechtshinweis); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(142, 0, 13, 14); + contentPanel.add(label_1); + + JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC"); + lblNewLabel_1.setBounds(150, 0, 74, 14); + contentPanel.add(lblNewLabel_1); + + JPanel panelNews = new JPanel(); + panelNews.setLayout(null); + panelNews.setBorder(new TitledBorder(UIManager + .getBorder("TitledBorder.border"), "News", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panelNews.setBackground(SystemColor.menu); + panelNews.setBounds(290, 327, 270, 170); + contentPanel.add(panelNews); + + ScrollPane scrollPaneNews = new ScrollPane(); + // scrollPaneDesc.setBounds(10, 15, 250, 145); + scrollPaneNews.setBounds(10, 15, 250, 145); + JTextArea txtNews = new JTextArea(); + txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtNews.setBackground(SystemColor.menu); + txtNews.setWrapStyleWord(true); + txtNews.setLineWrap(true); + txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten, sind als HS-spezifisch :)"); + scrollPaneNews.add(txtNews); + panelNews.add(scrollPaneNews); + + /* + * Funktion Texte für das Klicken der RadioButtons + */ + rdbtnImageNew.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."; + txtDesc.setText(descNewImage); + } + }); + rdbtnImageEdit.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descEditImage = "Bearbeiten Sie die hinterlegten Informationen zu einem Image oder laden Sie eine neue .vmdk-Datei hoch."; + txtDesc.setText(descEditImage); + } + }); + rdbtnImageDelete.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese."; + txtDesc.setText(descDeleteImage); + } + }); + rdbtnImageSearchDownload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen."; + txtDesc.setText(descSearchImage); + } + }); + rdbtnVeranstaltungNew.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() { + public void actionPerformed(ActionEvent e) { + descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; + txtDesc.setText(descEditLecture); + } + }); + rdbtnVeranstaltungDelete.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + } + }); + rdbtnVeranstaltungSearch.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); + } + }); + /* + * Ende der Radiobuttons + */ + + JLabel lblGrafik = new JLabel(""); + // ToolTipp für Grafik + lblGrafik + .setToolTipText("" + + "Ein virtuelles Labor besteht immer aus den beiden Komponenten
" + + "Image und Veranstaltung. Ein Image ist dabei die Grundlage f\u00FCr
" + + "mehrere Veranstaltungen. Somit kann eine neue Veranstaltung
" + + "erstellt werden, ohne ein neues Image hochladen zu m\u00FCssen.


" + + "Image: Das Image enth\u00E4lt die ben\u00F6tigte Software, die im
" + + "virtuellen Labor ben\u00F6tigt wird. Es wird von genau einem Dozenten
" + + "angelegt und besitzt einen allgemeinen Namen, z.B. \"Programmieren\".
" + + "Bei einem Image handelt es sich um eine Datei vom Typ VMDK.


" + + "Veranstaltung: Es k\u00F6nnen nun, basierend auf einem Image,
" + + " beliebig viele Veranstaltungen von unterschiedlichen Dozenten erstellt
" + + "werden. Diese k\u00F6nnten z.B. konkret \"Web-Entwicklung\" oder \"K\u00FCnstliche
" + + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + + "\"Programmieren\"."); + lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class + .getResource("/Image_zu_Veranstaltung_HDD.png"))); + // ToolTipp lange anzeigen - 60sec + ToolTipManager.sharedInstance().setDismissDelay(60000); + ToolTipManager.sharedInstance().registerComponent(lblGrafik); + lblGrafik.setBounds(82, 11, 391, 110); + contentPanel.add(lblGrafik); + + JTextPane txtpnUmDetaillierteInformationen = new JTextPane(); + txtpnUmDetaillierteInformationen + .setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik."); + txtpnUmDetaillierteInformationen.setEditable(false); + txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu); + txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22); + contentPanel.add(txtpnUmDetaillierteInformationen); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 630, 587, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton continueButton = new JButton("Weiter"); + + continueButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + if (rdbtnImageNew.isSelected() == true) { + EingabeImageAllgemein_GUI sr = new EingabeImageAllgemein_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) { + EingabeLectureAllgemein_GUI av = new EingabeLectureAllgemein_GUI(); + av.setVisible(true); + dispose(); + } else if (rdbtnVeranstaltungEdit.isSelected() == true) { + SearchEditLecture_GUI sl = new SearchEditLecture_GUI(); + sl.setVisible(true); + dispose(); + } + } + }); + continueButton.setActionCommand("OK"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); + } + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 617, 587, 2); + getContentPane().add(separator); + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 91, 587, 2); + getContentPane().add(separator); + } + + 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); + + }// end main + +}// end class diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java new file mode 100644 index 00000000..2f578e8b --- /dev/null +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -0,0 +1,216 @@ +package gui.intro; + + +import java.awt.Desktop; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Toolkit; +import javax.swing.JFrame; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.JLabel; +import java.awt.Font; +import javax.swing.JTextPane; +import java.awt.SystemColor; +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import javax.swing.JSeparator; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.JCheckBox; +import javax.swing.event.ChangeListener; +import javax.swing.event.ChangeEvent; + +import org.ini4j.InvalidFileFormatException; +import org.ini4j.Wini; + + +@SuppressWarnings("serial") +public class VmWareLink_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JCheckBox chckbxNewCheckBox; + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + VmWareLink_GUI dialog = new VmWareLink_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public VmWareLink_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("Dozentenmodul *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBounds(0, 0, 577, 80); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Hinweis VMWare Player"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 42); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 104, 567, 502); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JTextPane txtpnUmIhreVmdk = new JTextPane(); + txtpnUmIhreVmdk.setBackground(SystemColor.menu); + txtpnUmIhreVmdk.setEditable(false); + txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden."); + txtpnUmIhreVmdk.setBounds(10, 16, 499, 66); + contentPanel.add(txtpnUmIhreVmdk); + + JLabel lblNewLabel_1 = new JLabel("Windows: "); + lblNewLabel_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseReleased(MouseEvent arg0) { + URI url; + try { + url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"); + Desktop.getDesktop().browse(url); + } catch (URISyntaxException | IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + }); + + lblNewLabel_1.setBounds(10, 93, 499, 14); + contentPanel.add(lblNewLabel_1); + + chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen."); + chckbxNewCheckBox.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + if(chckbxNewCheckBox.isSelected()==true) + { + try { + Wini ini=new Wini(new File("C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + ini.put("main", "vmware",true); + ini.store(); + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + } + }); + chckbxNewCheckBox.setBounds(6, 472, 555, 23); + contentPanel.add(chckbxNewCheckBox); + + JLabel lbllinuxvmwarePlayer = new JLabel("Linux: "); + lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14); + contentPanel.add(lbllinuxvmwarePlayer); + + JLabel lblvmwarePlayerDownload = new JLabel("vmWare Player Download"); + lblvmwarePlayerDownload.setBounds(10, 118, 499, 14); + contentPanel.add(lblvmwarePlayerDownload); + + JLabel lblvmwarePlayerDownload_1 = new JLabel("vmWare Player Download"); + lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14); + contentPanel.add(lblvmwarePlayerDownload_1); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 630, 587, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + MainMenue_GUI ea=new MainMenue_GUI(); + ea.setVisible(true); + dispose(); + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 617, 587, 2); + getContentPane().add(separator); + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 91, 587, 2); + getContentPane().add(separator); + } + { + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + { + JMenu mnHilfe = new JMenu("Hilfe"); + menuBar.add(mnHilfe); + { + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnHilfe.add(mntmFaq); + } + { + JMenuItem mntmHilfe = new JMenuItem("Hilfe"); + mnHilfe.add(mntmHilfe); + } + } + } + + + + } +} diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java new file mode 100644 index 00000000..5c84610c --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -0,0 +1,413 @@ +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.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +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.JSeparator; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; + +import models.Image; +import models.Lecture; +import models.person; +import javax.swing.JTextArea; +import java.awt.ScrollPane; +import com.toedter.calendar.JDateChooser; +import javax.swing.JRadioButton; +import javax.swing.ButtonGroup; + + +@SuppressWarnings("serial") +public class EditLectureAllgemein_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField Vorname; + private JTextField Nachname; + private JTextField Hochschule; + private JTextField EMail; + private JTextField textFieldLaborname; + JTextArea description; + JRadioButton radioButtonyes; + JDateChooser dateChooserend; + JDateChooser dateChooserstart; + JRadioButton radioButtonno; + private final ButtonGroup buttonGroup = new ButtonGroup(); + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public EditLectureAllgemein_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 21); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 331, 557, 162); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel label = new JLabel("Vorname: *"); + label.setBackground(SystemColor.menu); + label.setBounds(10, 33, 125, 20); + panel_1.add(label); + + Vorname = new JTextField(); + Vorname.setEditable(false); + Vorname.setEnabled(false); + Vorname.setText(person.verantwortlicher.getVorname()); + Vorname.setBackground(Color.WHITE); + Vorname.setColumns(10); + Vorname.setBounds(145, 33, 350, 20); + panel_1.add(Vorname); + + JLabel label_7 = new JLabel("Nachname: *"); + label_7.setBackground(SystemColor.menu); + label_7.setBounds(10, 64, 125, 20); + panel_1.add(label_7); + + Nachname = new JTextField(); + Nachname.setEnabled(false); + Nachname.setEditable(false); + Nachname.setText(person.verantwortlicher.getName()); + Nachname.setBackground(Color.WHITE); + Nachname.setColumns(10); + Nachname.setBounds(145, 64, 350, 20); + panel_1.add(Nachname); + + JLabel label_8 = new JLabel("Hochschule: *"); + label_8.setBackground(SystemColor.menu); + label_8.setBounds(10, 95, 125, 20); + panel_1.add(label_8); + + Hochschule = new JTextField(); + Hochschule.setEnabled(false); + Hochschule.setEditable(false); + Hochschule.setText(person.verantwortlicher.getHochschule()); + Hochschule.setBackground(Color.WHITE); + Hochschule.setColumns(10); + Hochschule.setBounds(145, 95, 350, 20); + panel_1.add(Hochschule); + + JLabel label_9 = new JLabel("E-Mail: *"); + label_9.setBackground(SystemColor.menu); + label_9.setBounds(10, 126, 125, 20); + panel_1.add(label_9); + + EMail = new JTextField(); + EMail.setEnabled(false); + EMail.setEditable(false); + EMail.setText(person.verantwortlicher.getEMail()); + EMail.setBackground(Color.WHITE); + EMail.setColumns(10); + EMail.setBounds(145, 126, 350, 20); + panel_1.add(EMail); + + 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) { + + EditLectureAllgemein_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 36, 557, 284); + contentPanel.add(panel_2); + + JLabel label_3 = new JLabel("Laborname (Anzeigename): *"); + label_3.setBounds(10, 25, 180, 14); + panel_2.add(label_3); + + textFieldLaborname = new JTextField(); + textFieldLaborname.setText(Lecture.lecture.getName()); + textFieldLaborname.setColumns(10); + textFieldLaborname.setBounds(200, 22, 347, 20); + panel_2.add(textFieldLaborname); + + JTextArea textArea = new JTextArea(); + textArea.setWrapStyleWord(true); + textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + textArea.setLineWrap(true); + textArea.setFont(new Font("Tahoma", Font.PLAIN, 12)); + textArea.setBackground(SystemColor.menu); + textArea.setBounds(10, 49, 537, 49); + panel_2.add(textArea); + + JLabel label_4 = new JLabel("Beschreibung: *"); + label_4.setBounds(10, 111, 180, 14); + panel_2.add(label_4); + + ScrollPane scrollPane = new ScrollPane(); + scrollPane.setBounds(200, 104, 347, 78); + panel_2.add(scrollPane); + description = new JTextArea(); + description.setText(Lecture.lecture.getDesc()); + description.setLineWrap(true); + scrollPane.add(description); + description.setBounds(0, 0, 4, 22); + scrollPane.add(description); + + dateChooserend = new JDateChooser(); + dateChooserend.setDateFormatString("dd-MM-yyyy hh:mm:ss"); + dateChooserend.setDate(Lecture.lecture.getEnddate()); + dateChooserend.setBounds(385, 188, 100, 20); + panel_2.add(dateChooserend); + + JLabel label_5 = new JLabel("bis"); + label_5.setBounds(351, 188, 24, 20); + panel_2.add(label_5); + + dateChooserstart = new JDateChooser(); + dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserstart.setDate(Lecture.lecture.getStartdate()); + dateChooserstart.setBounds(240, 188, 101, 20); + panel_2.add(dateChooserstart); + + JLabel label_6 = new JLabel("von:"); + label_6.setBounds(200, 188, 30, 20); + panel_2.add(label_6); + + JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *"); + label_10.setBounds(10, 188, 250, 14); + panel_2.add(label_10); + + JLabel label_11 = new JLabel("Aktiv:"); + label_11.setBounds(10, 229, 250, 14); + panel_2.add(label_11); + + radioButtonyes = new JRadioButton("Ja"); + buttonGroup.add(radioButtonyes); + if(Lecture.lecture.isActive()==true) + { + radioButtonyes.setSelected(true); + }else + { + radioButtonno.setSelected(true); + } + + radioButtonyes.setBounds(240, 225, 109, 23); + panel_2.add(radioButtonyes); + + radioButtonno = new JRadioButton("Nein"); + buttonGroup.add(radioButtonno); + radioButtonno.setBounds(385, 225, 109, 23); + panel_2.add(radioButtonno); + + JLabel label_12 = new JLabel("(Im VMChooser sichtbar)"); + label_12.setBounds(10, 254, 250, 14); + panel_2.add(label_12); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if(radioButtonyes.isSelected()==true) + { + Lecture.lecture.setActive(true); + } + else + { + Lecture.lecture.setActive(false); + } + + Lecture.lecture.setName(textFieldLaborname.getText()); + Lecture.lecture.setDesc(description.getText()); + Lecture.lecture.setEnddate(dateChooserend.getDate()); + Lecture.lecture.setStartdate(dateChooserstart.getDate()); + Image.image.setImagename(textFieldLaborname.getText()); + + MainMenue_GUI sr=new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if(radioButtonyes.isSelected()==true) + { + Lecture.lecture.setActive(true); + } + else + { + Lecture.lecture.setActive(false); + } + + Lecture.lecture.setName(textFieldLaborname.getText()); + Lecture.lecture.setDesc(description.getText()); + Lecture.lecture.setEnddate(dateChooserend.getDate()); + Lecture.lecture.setStartdate(dateChooserstart.getDate()); + Image.image.setImagename(textFieldLaborname.getText()); + + + LinkLecture_GUI ev=new LinkLecture_GUI(); + ev.setVisible(true); + dispose(); + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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); + + JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); + lblPflichtfelder.setBounds(32, 602, 136, 14); + getContentPane().add(lblPflichtfelder); + + 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); + + } + + +} \ No newline at end of file diff --git a/Dozentenmodul/src/gui/lecture/EditLinkLecture_GUI.java b/Dozentenmodul/src/gui/lecture/EditLinkLecture_GUI.java new file mode 100644 index 00000000..2288f5b0 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/EditLinkLecture_GUI.java @@ -0,0 +1,438 @@ +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.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +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.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.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.table.DefaultTableModel; + +import models.Lecture; +import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class EditLinkLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + private JTextField textFieldName; + String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; + ThriftConnection thrift=new ThriftConnection(); + Client client=thrift.getThriftConnection(); + + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLinkLecture_GUI dialog = new EditLinkLecture_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public EditLinkLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 603) / 2; + int left=(screenSize.width - 722) / 2; + setBounds(left, top, 603, 722); + + + final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); + final DefaultTableModel model = new DefaultTableModel( titles, 0 ); + + + 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("Veanstaltung verlinken"); + 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); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + textFieldName = new JTextField(); + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + String stext=textFieldName.getText(); + modelAll.setRowCount(0); + initTableModel(modelAll); + + if(stext!="") + for(int i=0;iErweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + 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(); + try { + List list=client.getAllOS(); + comboBox.addItem(""); + for(int i=0;i"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 76, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(151, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken"); + lblNewLabel_1.setBounds(164, 11, 113, 14); + contentPanel.add(lblNewLabel_1); + + JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + JTable tablemyImages=new JTable(); + tablemyImages.setModel(model); + 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(); + + 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(); + + + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages=new JTable(); + 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 Images", null, scrollPaneCoopImages, null); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable 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); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + JTable 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); + + JButton btnLinkLschen = new JButton("Link l\u00F6schen"); + btnLinkLschen.setBounds(478, 508, 89, 23); + contentPanel.add(btnLinkLschen); + + initTableModel(modelAll); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString(); + try { + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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); + + } + + public DefaultTableModel initTableModel(DefaultTableModel model){ + List images; + try { + images = client.getImageList(); + Iterator i=images.iterator(); + List ListObj = new ArrayList(); + int x=0; + + while(i.hasNext()) + { + + i.next(); + Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()}; + ListObj.add(obj); + model.addRow(ListObj.get(x)); + x++; + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + } + + diff --git a/Dozentenmodul/src/gui/lecture/EingabeLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EingabeLectureAllgemein_GUI.java new file mode 100644 index 00000000..ed915892 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/EingabeLectureAllgemein_GUI.java @@ -0,0 +1,506 @@ +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.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +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.JSeparator; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import models.Image; +import models.Lecture; +import models.person; +import javax.swing.JTextArea; +import java.awt.ScrollPane; +import java.util.Calendar; +import java.util.Date; + +import com.toedter.calendar.JDateChooser; +import javax.swing.JRadioButton; + +@SuppressWarnings("serial") +public class EingabeLectureAllgemein_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField Vorname; + private JTextField Nachname; + private JTextField Hochschule; + private JTextField EMail; + private JTextField txtFldVeranstaltungsname; + JTextArea description; + JRadioButton radioButtonyes; + JRadioButton radioButtonno; + JDateChooser dateChooserend; + JDateChooser dateChooserstart; + Date startDate = new Date(); + Date endDate; + int maxLifeTime = 180; // Anzahl Tage, die eine Veranstaltung in der Zukunft + // aktiv sein darf + boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, + isAllInformationReady = false; + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EingabeLectureAllgemein_GUI dialog = new EingabeLectureAllgemein_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public EingabeLectureAllgemein_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + + @Override + public void windowOpened(WindowEvent arg0) { + txtFldVeranstaltungsname.requestFocusInWindow(); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + // setBounds(100, 100, 603, 722); + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 21); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Informationen zum Besitzer", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 331, 557, 162); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel label = new JLabel("Vorname: *"); + label.setBackground(SystemColor.menu); + label.setBounds(10, 33, 125, 20); + panel_1.add(label); + + Vorname = new JTextField(); + Vorname.setEditable(false); + Vorname.setEnabled(false); + Vorname.setText(person.verantwortlicher.getVorname()); + Vorname.setBackground(Color.WHITE); + Vorname.setColumns(10); + Vorname.setBounds(145, 33, 350, 20); + panel_1.add(Vorname); + + JLabel label_7 = new JLabel("Nachname: *"); + label_7.setBackground(SystemColor.menu); + label_7.setBounds(10, 64, 125, 20); + panel_1.add(label_7); + + Nachname = new JTextField(); + Nachname.setEnabled(false); + Nachname.setEditable(false); + Nachname.setText(person.verantwortlicher.getName()); + Nachname.setBackground(Color.WHITE); + Nachname.setColumns(10); + Nachname.setBounds(145, 64, 350, 20); + panel_1.add(Nachname); + + JLabel label_8 = new JLabel("Hochschule: *"); + label_8.setBackground(SystemColor.menu); + label_8.setBounds(10, 95, 125, 20); + panel_1.add(label_8); + + Hochschule = new JTextField(); + Hochschule.setEnabled(false); + Hochschule.setEditable(false); + Hochschule.setText(person.verantwortlicher.getHochschule()); + Hochschule.setBackground(Color.WHITE); + Hochschule.setColumns(10); + Hochschule.setBounds(145, 95, 350, 20); + panel_1.add(Hochschule); + + JLabel label_9 = new JLabel("E-Mail: *"); + label_9.setBackground(SystemColor.menu); + label_9.setBounds(10, 126, 125, 20); + panel_1.add(label_9); + + EMail = new JTextField(); + EMail.setEnabled(false); + EMail.setEditable(false); + EMail.setText(person.verantwortlicher.getEMail()); + EMail.setBackground(Color.WHITE); + EMail.setColumns(10); + EMail.setBounds(145, 126, 350, 20); + panel_1.add(EMail); + + 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) { + + EingabeLectureAllgemein_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 36, 557, 284); + contentPanel.add(panel_2); + + JLabel label_3 = new JLabel("Laborname (Anzeigename): *"); + label_3.setBounds(10, 25, 180, 14); + panel_2.add(label_3); + + txtFldVeranstaltungsname = new JTextField(); + txtFldVeranstaltungsname.setColumns(10); + txtFldVeranstaltungsname.setBounds(200, 22, 347, 20); + txtFldVeranstaltungsname.setText(Lecture.lecture.getName()); + panel_2.add(txtFldVeranstaltungsname); + + JTextArea textArea = new JTextArea(); + textArea.setEditable(false); + textArea.setWrapStyleWord(true); + textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + textArea.setLineWrap(true); + textArea.setFont(new Font("Tahoma", Font.PLAIN, 12)); + textArea.setBackground(SystemColor.menu); + textArea.setBounds(10, 49, 537, 49); + panel_2.add(textArea); + + JLabel lblDesc = new JLabel("Beschreibung: *"); + lblDesc.setBounds(10, 111, 180, 14); + panel_2.add(lblDesc); + + ScrollPane scrollPane = new ScrollPane(); + scrollPane.setBounds(200, 104, 347, 78); + panel_2.add(scrollPane); + description = new JTextArea(); + description.setFont(new Font("Tahoma", Font.PLAIN, 11)); + description.setLineWrap(true); + description.setText(Lecture.lecture.getDesc()); + scrollPane.add(description); + description.setBounds(0, 0, 4, 22); + scrollPane.add(description); + + dateChooserend = new JDateChooser(); + endDate = addDays(new Date(), maxLifeTime); // Datum darf weiter als 6 + // Monate in der Zukunft + // liegen + dateChooserend.setDate(endDate); + if (Lecture.lecture.getEnddate() == null) { + // is not defined yet + dateChooserend.setDate(endDate); + } else { + // already defined from last visit on this page + dateChooserend.setDate(Lecture.lecture.getEnddate()); + } + dateChooserend.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserend.setBounds(404, 188, 143, 20); + panel_2.add(dateChooserend); + + JLabel lblBis = new JLabel("bis:"); + lblBis.setBounds(378, 188, 21, 20); + panel_2.add(lblBis); + + dateChooserstart = new JDateChooser(); + if (Lecture.lecture.getStartdate() == null) { + // is not defined yet + dateChooserstart.setDate(startDate); + } else { + // already defined from last visit on this page + dateChooserstart.setDate(Lecture.lecture.getStartdate()); + } + dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserstart.setBounds(226, 188, 143, 20); + panel_2.add(dateChooserstart); + + JLabel label_6 = new JLabel("von:"); + label_6.setBounds(200, 188, 30, 20); + panel_2.add(label_6); + + JLabel label_10 = new JLabel("G\u00FCltigkeitsdatum: *"); + label_10.setBounds(10, 194, 127, 14); + panel_2.add(label_10); + + JLabel label_11 = new JLabel("Aktiv:"); + label_11.setBounds(10, 229, 127, 14); + panel_2.add(label_11); + + radioButtonyes = new JRadioButton("Ja"); + radioButtonyes.setSelected(true); + radioButtonyes.setBounds(200, 225, 73, 23); + panel_2.add(radioButtonyes); + + radioButtonno = new JRadioButton("Nein"); + radioButtonyes.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + radioButtonyes.setSelected(true); + radioButtonno.setSelected(false); + } + }); + radioButtonno.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + radioButtonno.setSelected(true); + radioButtonyes.setSelected(false); + } + }); + radioButtonno.setBounds(296, 225, 73, 23); + panel_2.add(radioButtonno); + + JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)"); + lblimVmchooserSichtbar.setBounds(10, 245, 127, 14); + panel_2.add(lblimVmchooserSichtbar); + + JLabel lblmaxMonate = new JLabel("(max. 6 Monate)"); + lblmaxMonate.setBounds(10, 208, 127, 14); + panel_2.add(lblmaxMonate); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (radioButtonyes.isSelected() == true) { + Lecture.lecture.setActive(true); + } else { + Lecture.lecture.setActive(false); + } + + Lecture.lecture.setName(txtFldVeranstaltungsname + .getText()); + Lecture.lecture.setDesc(description.getText()); + Lecture.lecture.setEnddate(dateChooserend.getDate()); + Lecture.lecture.setStartdate(dateChooserstart.getDate()); + Image.image.setImagename(txtFldVeranstaltungsname + .getText()); + + MainMenue_GUI sr = new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + backButton.setActionCommand("Cancel"); + buttonPane.add(backButton); + getRootPane().setDefaultButton(backButton); + } + { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // liegt das End-Datum vor dem Start-Datum? + if (dateChooserend.getDate().before( + dateChooserstart.getDate())) { + // datum ist falsch rum + isDateOrderCorrect = false; + JOptionPane + .showMessageDialog( + null, + "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", + "Datum fehlerhaft", + JOptionPane.ERROR_MESSAGE); + } else { + // bereit + isDateOrderCorrect = true; + } + // liegt das eingegebene Datum nach dem erlaubten + // End-Datum? + if (dateChooserend.getDate().after(endDate)) { + // Datum zu weit weg + isDateMaxLifeTimeCorrect = false; + JOptionPane.showMessageDialog(null, + "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" + + endDate, "Datum fehlerhaft", + JOptionPane.ERROR_MESSAGE); + } else { + // bereit + isDateMaxLifeTimeCorrect = true; + } + // Prüfen ob alles eingegeben wurde + if (txtFldVeranstaltungsname.getText().isEmpty() == true + || description.getText().isEmpty() == true) { + // mind 1 Textfeld ist leer + isAllInformationReady = false; + JOptionPane + .showMessageDialog( + null, + "Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.", + "Datum fehlerhaft", + JOptionPane.ERROR_MESSAGE); + } else { + // Textfelder bereit + isAllInformationReady = true; + } + + // welcher Radiobutton ist geklickt? + if (radioButtonyes.isSelected() == true) { + Lecture.lecture.setActive(true); + } else { + Lecture.lecture.setActive(false); + } + // Prüfe ob alle Eingaben korrekt sind, dann mache + // weiter + if (isAllInformationReady == true + && isDateMaxLifeTimeCorrect == true + && isDateOrderCorrect == true) { + // everything is ok, proceed + Lecture.lecture.setName(txtFldVeranstaltungsname + .getText()); + Lecture.lecture.setDesc(description.getText()); + Lecture.lecture.setEnddate(dateChooserend.getDate()); + Lecture.lecture.setStartdate(dateChooserstart + .getDate()); + Image.image.setImagename(txtFldVeranstaltungsname + .getText()); + + LinkLecture_GUI ev = new LinkLecture_GUI(); + ev.setVisible(true); + dispose(); + } + + } + }); + 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); + + JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); + lblPflichtfelder.setBounds(32, 602, 136, 14); + getContentPane().add(lblPflichtfelder); + + 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); + + } + + public Date addDays(Date date, int days) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.DATE, days); // minus number would decrement the days + return cal.getTime(); + } +} diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java new file mode 100644 index 00000000..5f6336c8 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -0,0 +1,237 @@ +package gui.lecture; + + +import gui.image.EingabeImageAllgemein_GUI; +import gui.image.FTPUploader_GUI; + +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.WindowAdapter; +import java.awt.event.WindowEvent; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +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.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; + +@SuppressWarnings("serial") +public class ExtendedSearchForImages_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField textField; + private JTextField textField_1; + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public ExtendedSearchForImages_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width -603) / 2; + setBounds(left, top, 603, 722); + + 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("Weitere Suchoptionen"); + 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("beschreibung"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 11, 557, 95); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Image-Typ"); + lblNewLabel_2.setBounds(10, 39, 176, 20); + panel_1.add(lblNewLabel_2); + + JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image"); + chckbxBestehendesImage.setSelected(true); + chckbxBestehendesImage.setBounds(192, 38, 138, 23); + panel_1.add(chckbxBestehendesImage); + + JCheckBox chckbxRohling = new JCheckBox("Rohling"); + chckbxRohling.setSelected(true); + chckbxRohling.setBounds(332, 38, 97, 23); + panel_1.add(chckbxRohling); + + JPanel panel = new JPanel(); + panel.setLayout(null); + panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 117, 557, 95); + contentPanel.add(panel); + + JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software"); + lblEnthalteneSoftware.setBounds(10, 39, 176, 20); + panel.add(lblEnthalteneSoftware); + + textField = new JTextField(); + textField.setBounds(196, 39, 351, 20); + panel.add(textField); + textField.setColumns(10); + + JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben"); + lblNewLabel_1.setBounds(196, 70, 351, 14); + panel.add(lblNewLabel_1); + + JPanel panel_2 = new JPanel(); + panel_2.setLayout(null); + panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 223, 557, 123); + contentPanel.add(panel_2); + + JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers"); + lblNachnameDesErstellers.setBounds(10, 39, 176, 20); + panel_2.add(lblNachnameDesErstellers); + + textField_1 = new JTextField(); + textField_1.setColumns(10); + textField_1.setBounds(196, 39, 351, 20); + panel_2.add(textField_1); + + JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t"); + lblHochschuleuniversitt.setBounds(10, 70, 176, 20); + panel_2.add(lblHochschuleuniversitt); + + JComboBox comboBox = new JComboBox(); + comboBox.setBounds(196, 70, 351, 20); + panel_2.add(comboBox); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + + EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI(); + sr.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("\u00DCbernehmen"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + + FTPUploader_GUI ea=new FTPUploader_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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/lecture/LinkLecture_GUI.java b/Dozentenmodul/src/gui/lecture/LinkLecture_GUI.java new file mode 100644 index 00000000..815f6799 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/LinkLecture_GUI.java @@ -0,0 +1,473 @@ +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.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +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; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.table.DefaultTableModel; + +import models.Lecture; +import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class LinkLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + private JTextField textFieldName; + String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + "Verantwortlicher", "Letztes Update", "Schlagwort" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + LinkLecture_GUI dialog = new LinkLecture_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public LinkLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + + @Override + public void windowOpened(WindowEvent arg0) { + textFieldName.requestFocusInWindow(); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 603) / 2; + int left = (screenSize.width - 722) / 2; + setBounds(left, top, 603, 722); + + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel model = new DefaultTableModel(titles, 0); + + 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 VL-Image"); + 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); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + textFieldName = new JTextField(); + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + String stext = textFieldName.getText(); + modelAll.setRowCount(0); + initTableModel(modelAll); + + if (stext != "") + for (int i = 0; i < modelAll.getRowCount(); i++) { + + if (modelAll.getValueAt(i, 0).toString() + .startsWith(stext)) { + + } else { + modelAll.removeRow(i); + } + } + + } + + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "Erweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + 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(); + try { + List list = client.getAllOS(); + comboBox.addItem(""); + for (int i = 0; i < list.size(); i++) { + comboBox.addItem(list.get(i)); + } + } catch (TException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + comboBox.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + modelAll.setRowCount(0); + initTableModel(modelAll); + String selItem = comboBox.getSelectedItem().toString(); + if (selItem != "") { + for (int i = 0; i < modelAll.getRowCount(); i++) { + + if (modelAll.getValueAt(i, 2).equals(selItem)) { + + } else { + modelAll.removeRow(i); + } + } + + } + } + }); + 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) { + + LinkLecture_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); + lblNewLabel_1.setBounds(146, 11, 85, 14); + contentPanel.add(lblNewLabel_1); + + JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + JTable tablemyImages = new JTable(); + tablemyImages.setModel(model); + 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(); + + 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(); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages = new JTable(); + 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 Images", null, scrollPaneCoopImages, + null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable 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(); + JTable 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); + + initTableModel(modelAll); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + con.closeThriftConnection(); + EingabeLectureAllgemein_GUI eVAG = new EingabeLectureAllgemein_GUI(); + eVAG.setVisible(true); + dispose(); + } + }); + cancelButton.setActionCommand("CANCEL"); + buttonPane.add(cancelButton); + getRootPane().setDefaultButton(cancelButton); + } + { + JButton doLinkButton = new JButton( + "Veranstaltung erzeugen und abschlie\u00DFen"); + doLinkButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + String imagename = tableAllImages.getValueAt( + tableAllImages.getSelectedRow(), 0).toString(); + try { + DateFormat formatter = new SimpleDateFormat( + "yyyy-MM-dd hh:mm:ss"); + System.out.println("Veranstaltung anlegen um: " + + formatter.format( + Lecture.lecture.getStartdate()) + .toString()); + client.writeLecturedata( + Lecture.lecture.getName(), + Lecture.lecture.getShortDesc(), + Lecture.lecture.getDesc(), + formatter.format( + Lecture.lecture.getStartdate()) + .toString(), + formatter.format( + Lecture.lecture.getEnddate()) + .toString(), Lecture.lecture + .isActive(), imagename, + person.verantwortlicher.getVorname(), + person.verantwortlicher.getName(), + person.verantwortlicher.getHochschule(), + person.verantwortlicher.getEMail(), + person.verantwortlicher.getTel(), + person.verantwortlicher.getFakultät()); + JOptionPane + .showMessageDialog( + null, + "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", + "Veranstaltung angelegt", + JOptionPane.PLAIN_MESSAGE); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + JOptionPane + .showMessageDialog( + null, + "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", + "Error", JOptionPane.ERROR_MESSAGE); + } + con.closeThriftConnection(); + dispose(); + + } + }); + doLinkButton.setActionCommand("OK"); + buttonPane.add(doLinkButton); + } + } + + 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); + + } + + public DefaultTableModel initTableModel(DefaultTableModel model) { + List images; + try { + images = client.getImageList(); + Iterator i = images.iterator(); + List ListObj = new ArrayList(); + int x = 0; + + while (i.hasNext()) { + + i.next(); + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUpdateTime(), + images.get(x).getUserData() }; + ListObj.add(obj); + model.addRow(ListObj.get(x)); + x++; + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + +} diff --git a/Dozentenmodul/src/gui/lecture/SearchEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchEditLecture_GUI.java new file mode 100644 index 00000000..93fb899e --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/SearchEditLecture_GUI.java @@ -0,0 +1,451 @@ +package gui.lecture; + + +import gui.image.EditImageAllgemein_GUI; +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.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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.Lecture; +import models.person; +//import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + + +@SuppressWarnings("serial") +public class SearchEditLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JTable tableAllLectures; + JTable tablemyLectures; + 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 rowSorterAll = new TableRowSorter( modelAll ); + final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures ); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + SearchEditLecture_GUI dialog = new SearchEditLecture_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchEditLecture_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*"); + //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("Erweiterte Suche"); + 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(); + SearchEditLecture_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) { + System.out.println(tabbedPane.getSelectedIndex()); + 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); + System.out.println("haaaaaaaaaaa"); + 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(); + JTable 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(); + JTable 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(); + JTable 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 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(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + + //Image.image.setImageId(imageid); + if(tabbedPane.getSelectedIndex()==0){ + + + Lecture.lecture.setid(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString()); + Lecture.lecture.setName(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 0).toString()); + Lecture.lecture.setDesc(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 1).toString()); + String date=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 2).toString(); + Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 6).toString()); + String startdate=date.substring(0,date.indexOf(" ")); + String enddate=date.substring(date.indexOf(" ")); + DateFormat df=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + + try { + Lecture.lecture.setEnddate(df.parse(enddate)); + Lecture.lecture.setStartdate(df.parse(startdate)); + } catch (ParseException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + if(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 3).toString().equals("1")){ + Lecture.lecture.setActive(true); + } + else + { + Lecture.lecture.setActive(false); + } + + con.closeThriftConnection(); + EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + ea.setVisible(true); + dispose(); + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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 lectures; + try { + //Hole eine Liste der Images + lectures = client.getLectureList(); + Iterator 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/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java new file mode 100644 index 00000000..ae31236a --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java @@ -0,0 +1,246 @@ +package gui.lecture; + + +import gui.image.SearchImage_GUI; +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.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +import javax.swing.ButtonGroup; +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.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; + +@SuppressWarnings("serial") +public class SearchMethodLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnNachEinemVlimage; + JRadioButton rdbtnNachEinerVeranstaltung; + private final ButtonGroup buttonGroup = new ButtonGroup(); + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchMethodLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 603) / 2; + int left=(screenSize.width - 722) / 2; + setBounds(left, top, 603, 722); + //setBounds(100, 100, 603, 722); + 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("Eingabe Ihrer Daten"); + 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.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + 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, "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); + + 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.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.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); + + 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(); + 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); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + MainMenue_GUI sr=new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + if(rdbtnNachEinemVlimage.isSelected()==true) + { + SearchImage_GUI ea=new SearchImage_GUI(); + ea.setVisible(true); + dispose(); + } + } + + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + 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); + + } +} -- cgit v1.2.3-55-g7522