From 037e904354b540c9d242f64f46df94842d5d41d2 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 09:39:26 +0200 Subject: test --- 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.class | Bin 10887 -> 10887 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$1.class | Bin 674 -> 795 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$2.class | Bin 1221 -> 1221 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$3.class | Bin 742 -> 863 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$4.class | Bin 1228 -> 1228 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$5.class | Bin 751 -> 872 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$6.class | Bin 1316 -> 1705 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$7.class | Bin 790 -> 1838 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$8.class | Bin 809 -> 914 bytes Dozentenmodul/bin/gui/DeleteImage_GUI$9.class | Bin 0 -> 1946 bytes Dozentenmodul/bin/gui/DeleteImage_GUI.class | Bin 11325 -> 0 bytes .../bin/gui/DeleteImage_GUI_BACKUP$1.class | Bin 0 -> 716 bytes .../bin/gui/DeleteImage_GUI_BACKUP$2.class | Bin 0 -> 1270 bytes .../bin/gui/DeleteImage_GUI_BACKUP$3.class | Bin 0 -> 784 bytes .../bin/gui/DeleteImage_GUI_BACKUP$4.class | Bin 0 -> 1270 bytes .../bin/gui/DeleteImage_GUI_BACKUP$5.class | Bin 0 -> 793 bytes .../bin/gui/DeleteImage_GUI_BACKUP$6.class | Bin 0 -> 1358 bytes .../bin/gui/DeleteImage_GUI_BACKUP$7.class | Bin 0 -> 832 bytes .../bin/gui/DeleteImage_GUI_BACKUP$8.class | Bin 0 -> 956 bytes Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP.class | Bin 0 -> 11495 bytes Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 10887 -> 10887 bytes Dozentenmodul/src/GUI/MainMenue_GUI.java | 2 +- Dozentenmodul/src/gui/DeleteImage_GUI.java | 439 --------------------- Dozentenmodul/src/gui/MainMenue_GUI.java | 2 +- .../bin/server/BinaryListener.class | Bin 2151 -> 0 bytes .../bin/server/Image$ImageStandardScheme.class | Bin 3676 -> 0 bytes .../server/Image$ImageStandardSchemeFactory.class | Bin 869 -> 0 bytes .../bin/server/Image$ImageTupleScheme.class | Bin 3009 -> 0 bytes .../bin/server/Image$ImageTupleSchemeFactory.class | Bin 845 -> 0 bytes Dozentenmodulserver/bin/server/Image$_Fields.class | Bin 3410 -> 0 bytes Dozentenmodulserver/bin/server/Image.class | Bin 17587 -> 0 bytes .../bin/server/Lecture$LectureStandardScheme.class | Bin 3856 -> 0 bytes .../Lecture$LectureStandardSchemeFactory.class | Bin 901 -> 0 bytes .../bin/server/Lecture$LectureTupleScheme.class | Bin 3153 -> 0 bytes .../server/Lecture$LectureTupleSchemeFactory.class | Bin 877 -> 0 bytes .../bin/server/Lecture$_Fields.class | Bin 3487 -> 0 bytes Dozentenmodulserver/bin/server/Lecture.class | Bin 18746 -> 0 bytes .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 0 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 0 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 -> 0 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 0 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 0 bytes .../Server$AsyncClient$getLectureList_call.class | Bin 3039 -> 0 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3267 -> 0 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 0 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 0 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 0 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4410 -> 0 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4241 -> 0 bytes .../bin/server/Server$AsyncClient.class | Bin 8238 -> 0 bytes .../bin/server/Server$AsyncIface.class | Bin 1460 -> 0 bytes .../Server$AsyncProcessor$DeleteFtpUser$1.class | Bin 2969 -> 0 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 0 bytes .../server/Server$AsyncProcessor$getAllOS$1.class | Bin 2997 -> 0 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 0 bytes .../Server$AsyncProcessor$getFtpUser$1.class | Bin 2851 -> 0 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 0 bytes .../Server$AsyncProcessor$getImageData$1.class | Bin 3081 -> 0 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 0 bytes .../Server$AsyncProcessor$getImageList$1.class | Bin 3021 -> 0 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 0 bytes .../Server$AsyncProcessor$getLectureData$1.class | Bin 3099 -> 0 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 0 bytes .../Server$AsyncProcessor$getLectureList$1.class | Bin 3045 -> 0 bytes .../Server$AsyncProcessor$getLectureList.class | Bin 3132 -> 0 bytes .../Server$AsyncProcessor$getPathOfImage$1.class | Bin 2907 -> 0 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3174 -> 0 bytes .../Server$AsyncProcessor$getPersonData$1.class | Bin 3090 -> 0 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 0 bytes .../Server$AsyncProcessor$startFileCopy$1.class | Bin 2984 -> 0 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 0 bytes .../Server$AsyncProcessor$updateImageData$1.class | Bin 3002 -> 0 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 0 bytes .../Server$AsyncProcessor$writeLecturedata$1.class | Bin 3011 -> 0 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 0 bytes .../Server$AsyncProcessor$writeVLdata$1.class | Bin 2966 -> 0 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3490 -> 0 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3382 -> 0 bytes .../bin/server/Server$Client$Factory.class | Bin 1411 -> 0 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 14914 -> 0 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 0 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 0 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 0 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 0 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 0 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 0 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 0 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 0 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 0 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 0 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 0 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 0 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 1695 -> 0 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 0 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 0 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 0 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 0 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 0 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 0 bytes .../server/Server$Processor$getLectureList.class | Bin 1971 -> 0 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2060 -> 0 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 0 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 0 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 0 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2563 -> 0 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2390 -> 0 bytes .../bin/server/Server$Processor.class | Bin 3210 -> 0 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 0 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 0 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 0 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 0 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 0 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 0 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 0 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3464 -> 0 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 0 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 0 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 0 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 0 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 0 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 0 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 0 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 0 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 0 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 0 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 0 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 0 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 0 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 0 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 0 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 0 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 0 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 0 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 0 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 0 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 0 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 0 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 0 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 0 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 0 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 0 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 0 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 0 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 0 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 0 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 0 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 0 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 0 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 0 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 0 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 0 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 0 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 0 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 0 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 0 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 0 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 0 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 0 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 0 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 0 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 0 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 0 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 0 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 0 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 0 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 0 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 0 bytes .../Server$getLectureList_args$_Fields.class | Bin 2908 -> 0 bytes ...st_args$getLectureList_argsStandardScheme.class | Bin 2225 -> 0 bytes ...$getLectureList_argsStandardSchemeFactory.class | Bin 1178 -> 0 bytes ...eList_args$getLectureList_argsTupleScheme.class | Bin 1535 -> 0 bytes ...rgs$getLectureList_argsTupleSchemeFactory.class | Bin 1154 -> 0 bytes .../bin/server/Server$getLectureList_args.class | Bin 7544 -> 0 bytes .../Server$getLectureList_result$_Fields.class | Bin 3040 -> 0 bytes ...esult$getLectureList_resultStandardScheme.class | Bin 3518 -> 0 bytes ...etLectureList_resultStandardSchemeFactory.class | Bin 1210 -> 0 bytes ...t_result$getLectureList_resultTupleScheme.class | Bin 2905 -> 0 bytes ...t$getLectureList_resultTupleSchemeFactory.class | Bin 1186 -> 0 bytes .../bin/server/Server$getLectureList_result.class | Bin 10984 -> 0 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3106 -> 0 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2827 -> 0 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 0 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2290 -> 0 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 0 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 10797 -> 0 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 0 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 0 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 0 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 0 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 0 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 0 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 0 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 0 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 0 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 0 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 0 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 0 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 0 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 0 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 0 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 0 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 0 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 0 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 0 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 0 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 0 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 0 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 0 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 0 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 0 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 0 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 0 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 0 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 0 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 0 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 0 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 0 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 0 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 0 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 0 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 0 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 0 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 0 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 0 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 0 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 0 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 0 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4053 -> 0 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 4862 -> 0 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 0 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4056 -> 0 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 0 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 24604 -> 0 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 0 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 0 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 0 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 0 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 0 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 0 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3914 -> 0 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4637 -> 0 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 0 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 3886 -> 0 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 0 bytes .../bin/server/Server$writeVLdata_args.class | Bin 23310 -> 0 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 0 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 0 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 0 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 0 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 0 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 0 bytes Dozentenmodulserver/bin/server/Server.class | Bin 2354 -> 0 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 10497 -> 0 bytes .../bin/server/User$UserStandardScheme.class | Bin 2737 -> 0 bytes .../server/User$UserStandardSchemeFactory.class | Bin 853 -> 0 bytes .../bin/server/User$UserTupleScheme.class | Bin 2173 -> 0 bytes .../bin/server/User$UserTupleSchemeFactory.class | Bin 829 -> 0 bytes Dozentenmodulserver/bin/server/User$_Fields.class | Bin 2938 -> 0 bytes Dozentenmodulserver/bin/server/User.class | Bin 11240 -> 0 bytes Dozentenmodulserver/bin/server/startServer.class | Bin 1889 -> 0 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 12095 -> 12522 bytes Dozentenmodulserver/src/server/Server.java | 15 +- Dozentenmodulserver/src/server/ServerHandler.java | 2 +- Dozentenmodulserver/src/sql/SQL.java | 32 ++ Dozentenmodulserver/thrift/server.thrift | 1 + 270 files changed, 50 insertions(+), 443 deletions(-) create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI$9.class delete mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$1.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$2.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$3.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$4.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$5.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$6.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$7.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$8.class create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP.class delete mode 100644 Dozentenmodul/src/gui/DeleteImage_GUI.java delete mode 100644 Dozentenmodulserver/bin/server/BinaryListener.class delete mode 100644 Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Image$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Image.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Lecture.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncClient.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncIface.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class delete mode 100644 Dozentenmodulserver/bin/server/Server$AsyncProcessor.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Client$Factory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Client.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Iface.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getImageData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getImageList.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class delete mode 100644 Dozentenmodulserver/bin/server/Server$Processor.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getAllOS_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getFtpUser_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageData_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getImageList_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureData_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getLectureList_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$getPersonData_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$startFileCopy_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$updateImageData_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_args.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/Server$writeVLdata_result.class delete mode 100644 Dozentenmodulserver/bin/server/Server.class delete mode 100644 Dozentenmodulserver/bin/server/ServerHandler.class delete mode 100644 Dozentenmodulserver/bin/server/User$UserStandardScheme.class delete mode 100644 Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/User$UserTupleScheme.class delete mode 100644 Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class delete mode 100644 Dozentenmodulserver/bin/server/User$_Fields.class delete mode 100644 Dozentenmodulserver/bin/server/User.class delete mode 100644 Dozentenmodulserver/bin/server/startServer.class diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class index 57b08981..ae9c04f3 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class index 77e0fbd6..a19fcb59 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class index 6e35da4f..9ae0a452 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class index c6188012..6988de2e 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/DeleteImage_GUI$1.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class index 6139b7dc..a44ebfa6 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class index 214998fb..a90be02b 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class index 1ab047a4..12bc75ba 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class index 9382863b..2e03fcb7 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class index 0e845cc7..aaac3a5d 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class index 63b957b6..b5ef3dde 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class index b2bd5495..d58b35f4 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class index a1eb0a54..093446ec 100644 Binary files a/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class and b/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$9.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$9.class new file mode 100644 index 00000000..e767ccbf Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI$9.class 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/DeleteImage_GUI_BACKUP$1.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$1.class new file mode 100644 index 00000000..93042dbc Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$1.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$2.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$2.class new file mode 100644 index 00000000..fde64190 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$2.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$3.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$3.class new file mode 100644 index 00000000..95764c92 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$3.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$4.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$4.class new file mode 100644 index 00000000..206be8fd Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$4.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$5.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$5.class new file mode 100644 index 00000000..d78b785d Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$5.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$6.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$6.class new file mode 100644 index 00000000..4787de51 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$6.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$7.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$7.class new file mode 100644 index 00000000..761791a1 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$7.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$8.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$8.class new file mode 100644 index 00000000..e2242e37 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP$8.class differ diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP.class b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP.class new file mode 100644 index 00000000..d25cb609 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI_BACKUP.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class index c6188012..6988de2e 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/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java index 7cf7face..f1e79b82 100644 --- a/Dozentenmodul/src/GUI/MainMenue_GUI.java +++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java @@ -142,7 +142,7 @@ public class MainMenue_GUI extends JFrame { rdbtnImageEdit.setBackground(SystemColor.menu); rdbtnImageDelete = new JRadioButton("L\u00F6schen"); - rdbtnImageDelete.setEnabled(false); + rdbtnImageDelete.setEnabled(true); buttonGroup.add(rdbtnImageDelete); rdbtnImageDelete .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); 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/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java index 3c75c74f..71c28904 100644 --- a/Dozentenmodul/src/gui/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/MainMenue_GUI.java @@ -142,7 +142,7 @@ public class MainMenue_GUI extends JFrame { rdbtnImageEdit.setBackground(SystemColor.menu); rdbtnImageDelete = new JRadioButton("L\u00F6schen"); - rdbtnImageDelete.setEnabled(false); + rdbtnImageDelete.setEnabled(true); buttonGroup.add(rdbtnImageDelete); rdbtnImageDelete .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class deleted file mode 100644 index 8635e9d8..00000000 Binary files a/Dozentenmodulserver/bin/server/BinaryListener.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class b/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class deleted file mode 100644 index d2e80220..00000000 Binary files a/Dozentenmodulserver/bin/server/Image$ImageStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class deleted file mode 100644 index da393159..00000000 Binary files a/Dozentenmodulserver/bin/server/Image$ImageStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class b/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class deleted file mode 100644 index 63fdf940..00000000 Binary files a/Dozentenmodulserver/bin/server/Image$ImageTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class deleted file mode 100644 index ae9305a5..00000000 Binary files a/Dozentenmodulserver/bin/server/Image$ImageTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image$_Fields.class b/Dozentenmodulserver/bin/server/Image$_Fields.class deleted file mode 100644 index 1a5f4454..00000000 Binary files a/Dozentenmodulserver/bin/server/Image$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Image.class b/Dozentenmodulserver/bin/server/Image.class deleted file mode 100644 index 4aed38be..00000000 Binary files a/Dozentenmodulserver/bin/server/Image.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class b/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class deleted file mode 100644 index 9a345304..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture$LectureStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class deleted file mode 100644 index 8f40c279..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture$LectureStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class b/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class deleted file mode 100644 index 8cd68eca..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture$LectureTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class deleted file mode 100644 index a0ac20fb..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture$LectureTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture$_Fields.class b/Dozentenmodulserver/bin/server/Lecture$_Fields.class deleted file mode 100644 index e1ec6923..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Lecture.class b/Dozentenmodulserver/bin/server/Lecture.class deleted file mode 100644 index 8d3c743c..00000000 Binary files a/Dozentenmodulserver/bin/server/Lecture.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class deleted file mode 100644 index 3b9d4397..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class deleted file mode 100644 index 2c43cac8..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index d8b19130..2b1a82ef 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 a59da5f5..be624eaf 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 deleted file mode 100644 index 2e9cc3e9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class deleted file mode 100644 index 8501c7ec..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class deleted file mode 100644 index 6411099d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class deleted file mode 100644 index f709b0ab..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class deleted file mode 100644 index d7cdb5b1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class deleted file mode 100644 index a27ba365..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class deleted file mode 100644 index e35aa3c9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class deleted file mode 100644 index f1ca561d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class deleted file mode 100644 index 245e038b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class deleted file mode 100644 index a291104c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class deleted file mode 100644 index 24089548..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class deleted file mode 100644 index b4c3452d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class deleted file mode 100644 index c2b8c8b4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class deleted file mode 100644 index b8f40bfd..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class deleted file mode 100644 index 037e2a0e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class deleted file mode 100644 index ec8408d6..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class deleted file mode 100644 index 637feb39..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class deleted file mode 100644 index 01983d5f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class deleted file mode 100644 index 52fa8749..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class deleted file mode 100644 index 4875d569..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class deleted file mode 100644 index 026f88df..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class deleted file mode 100644 index 90f85c70..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class deleted file mode 100644 index 2cc8b662..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class deleted file mode 100644 index 021a75be..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class deleted file mode 100644 index 0908d7ae..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class deleted file mode 100644 index 243cdb6e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class deleted file mode 100644 index 09e90ad4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class deleted file mode 100644 index 93d9fd0c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class deleted file mode 100644 index b8365652..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class deleted file mode 100644 index 4d2e1e7d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class deleted file mode 100644 index 8abad359..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class deleted file mode 100644 index f45d23cb..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class deleted file mode 100644 index 43e70060..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class deleted file mode 100644 index 4d825aef..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class deleted file mode 100644 index 233d6a38..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class deleted file mode 100644 index 5ca204f4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class deleted file mode 100644 index bd250c12..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class deleted file mode 100644 index b5c32779..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class deleted file mode 100644 index 0dd19527..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Client$Factory.class b/Dozentenmodulserver/bin/server/Server$Client$Factory.class deleted file mode 100644 index 04b99dd9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Client$Factory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class deleted file mode 100644 index a53edb80..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class deleted file mode 100644 index 9773f94c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class deleted file mode 100644 index cdf99a6a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class deleted file mode 100644 index 11b46405..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class deleted file mode 100644 index 1604ccd9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class deleted file mode 100644 index f4087f12..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class deleted file mode 100644 index c09be4ea..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class deleted file mode 100644 index 0d260583..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class deleted file mode 100644 index 73099bd5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class deleted file mode 100644 index 487626d7..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class deleted file mode 100644 index 9d7e0821..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class deleted file mode 100644 index ac5fd84a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class deleted file mode 100644 index 9f83ee86..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class deleted file mode 100644 index 984ce3d0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class deleted file mode 100644 index 0024c63a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class deleted file mode 100644 index 352053ae..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class deleted file mode 100644 index 4946ff2c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class deleted file mode 100644 index 575fd039..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class deleted file mode 100644 index fa7f37fe..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class deleted file mode 100644 index cf8d6f8e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class deleted file mode 100644 index 0fd5531c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class deleted file mode 100644 index 6fda5a6a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class deleted file mode 100644 index ec7825e4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class deleted file mode 100644 index 6684bdd0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class deleted file mode 100644 index 11a82bc1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class deleted file mode 100644 index c6bf92e8..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class deleted file mode 100644 index b680920a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class deleted file mode 100644 index 53e74ef0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class deleted file mode 100644 index 6def7120..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class deleted file mode 100644 index 312ea60b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class deleted file mode 100644 index 16d200c1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class deleted file mode 100644 index d1e27803..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class deleted file mode 100644 index 5191355f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class deleted file mode 100644 index 54407845..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class deleted file mode 100644 index d808d84c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class deleted file mode 100644 index 96edd940..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class deleted file mode 100644 index 5e79cf8b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class deleted file mode 100644 index f4f0984a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class deleted file mode 100644 index 48526d6c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class deleted file mode 100644 index e09bdf39..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class deleted file mode 100644 index 10deab17..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class deleted file mode 100644 index fc32382e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class deleted file mode 100644 index b956eab6..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class deleted file mode 100644 index d39133ed..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class deleted file mode 100644 index 24c487fd..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class deleted file mode 100644 index c55f50bf..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class deleted file mode 100644 index ff3a8b41..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class deleted file mode 100644 index 7acb76f8..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class deleted file mode 100644 index fbba4555..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class deleted file mode 100644 index bdd39be2..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class deleted file mode 100644 index dd370d52..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class deleted file mode 100644 index fd81ae8b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class deleted file mode 100644 index e22cbdfa..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class deleted file mode 100644 index 8498d617..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class deleted file mode 100644 index 12e406bf..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class deleted file mode 100644 index f6dce637..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class deleted file mode 100644 index 3a4f0335..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class deleted file mode 100644 index 60309e42..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class deleted file mode 100644 index a1bd103e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class deleted file mode 100644 index 1d42f890..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class deleted file mode 100644 index 9fb72bfd..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class deleted file mode 100644 index b6d2bb01..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class deleted file mode 100644 index 5b8b23ea..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class deleted file mode 100644 index 7de2f91a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class deleted file mode 100644 index 7229554d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class deleted file mode 100644 index d20286ab..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class deleted file mode 100644 index a869fbd5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class deleted file mode 100644 index 94578ec5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class deleted file mode 100644 index 8f6acc07..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class deleted file mode 100644 index 1c5cf9f9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class deleted file mode 100644 index 9426692a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class deleted file mode 100644 index f0a143fa..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class deleted file mode 100644 index e2ebe7af..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class deleted file mode 100644 index 7a45a838..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class deleted file mode 100644 index 071f3392..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class deleted file mode 100644 index bece7fc9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class deleted file mode 100644 index e52102bb..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class deleted file mode 100644 index 9da1d6ca..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class deleted file mode 100644 index 0d9e8699..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class deleted file mode 100644 index ef6bf7f1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class deleted file mode 100644 index 94a399a7..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class deleted file mode 100644 index 44b880e5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class deleted file mode 100644 index c7ad31ec..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class deleted file mode 100644 index d5edd4e0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class deleted file mode 100644 index e0342d67..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class deleted file mode 100644 index a665373b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class deleted file mode 100644 index b4b62ad5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class deleted file mode 100644 index c6e7c9c5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class deleted file mode 100644 index 9a9fe0ed..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class deleted file mode 100644 index 7bee0908..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class deleted file mode 100644 index 950143f6..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class deleted file mode 100644 index d8bd5f1b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class deleted file mode 100644 index 2c2c0991..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class deleted file mode 100644 index 38f4e317..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class deleted file mode 100644 index b70cfde1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class deleted file mode 100644 index ba1d894b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class deleted file mode 100644 index 31a4084b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class deleted file mode 100644 index 48670cc8..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class deleted file mode 100644 index 7fb5a115..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class deleted file mode 100644 index 40a9c9fb..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class deleted file mode 100644 index 0f63f9d6..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class deleted file mode 100644 index 74950e56..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class deleted file mode 100644 index bfd5cc2a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class deleted file mode 100644 index 5ef55d0b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class deleted file mode 100644 index fd4a9f7e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class deleted file mode 100644 index ff7afb92..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class deleted file mode 100644 index feef7b46..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class deleted file mode 100644 index f0ac33a1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class deleted file mode 100644 index 83b9a4c5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class deleted file mode 100644 index 25d1b2c1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class deleted file mode 100644 index f36442a2..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class deleted file mode 100644 index 59447762..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class deleted file mode 100644 index a4b945d2..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class deleted file mode 100644 index 6ec24410..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class deleted file mode 100644 index 67a8a0ee..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class deleted file mode 100644 index 8493ee0b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class deleted file mode 100644 index 25f0c38f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class deleted file mode 100644 index 389890c3..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class deleted file mode 100644 index 3943daac..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class deleted file mode 100644 index c58642e3..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class deleted file mode 100644 index ce5b5b0f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class deleted file mode 100644 index 82309863..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class deleted file mode 100644 index 86b254f7..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class deleted file mode 100644 index d6d16352..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class deleted file mode 100644 index c048791b..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class deleted file mode 100644 index f06df85a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class deleted file mode 100644 index 6ecc4671..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class deleted file mode 100644 index 2972e45e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class deleted file mode 100644 index d595db2f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class deleted file mode 100644 index 1f700c16..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class deleted file mode 100644 index aee7b330..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class deleted file mode 100644 index 7a59baf4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class deleted file mode 100644 index 0fc19fe9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class deleted file mode 100644 index 332ccb41..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class deleted file mode 100644 index 277b0911..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class deleted file mode 100644 index 560e2d5d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class deleted file mode 100644 index c898c86e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class deleted file mode 100644 index 120bd44f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class deleted file mode 100644 index 13422057..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class deleted file mode 100644 index 903e65d0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class deleted file mode 100644 index 94307da1..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class deleted file mode 100644 index a4e5adf2..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class deleted file mode 100644 index 5c944f8a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class deleted file mode 100644 index b8fd33c9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class deleted file mode 100644 index ba90f65f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class deleted file mode 100644 index 7dbcf6c4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class deleted file mode 100644 index 7209c88d..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class deleted file mode 100644 index 3e442b85..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class deleted file mode 100644 index 45450799..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class deleted file mode 100644 index 76b69191..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class deleted file mode 100644 index a39bf6b9..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class deleted file mode 100644 index ea1657ec..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class deleted file mode 100644 index 68ab1a2a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class deleted file mode 100644 index 2038cb72..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class deleted file mode 100644 index 631b711f..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class deleted file mode 100644 index befa0f20..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class deleted file mode 100644 index 31f99f77..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class deleted file mode 100644 index b155d8b0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class deleted file mode 100644 index 21a434c8..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class deleted file mode 100644 index 0bf734f0..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class deleted file mode 100644 index fafcf90c..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class deleted file mode 100644 index 52887b65..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class deleted file mode 100644 index c818bde5..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class deleted file mode 100644 index 67113d47..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class deleted file mode 100644 index 606dfd60..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class deleted file mode 100644 index 8f6950f4..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class deleted file mode 100644 index 0d747e42..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class deleted file mode 100644 index 0035807a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class deleted file mode 100644 index 9012115e..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class deleted file mode 100644 index ace1cafa..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class deleted file mode 100644 index 20ccda53..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class deleted file mode 100644 index b2d046fa..00000000 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/Server.class b/Dozentenmodulserver/bin/server/Server.class deleted file mode 100644 index 9aed6d8a..00000000 Binary files a/Dozentenmodulserver/bin/server/Server.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class deleted file mode 100644 index 6af1fa09..00000000 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class deleted file mode 100644 index cf96c062..00000000 Binary files a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class deleted file mode 100644 index a409161e..00000000 Binary files a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class deleted file mode 100644 index 1eea1bb0..00000000 Binary files a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class deleted file mode 100644 index c76c48fe..00000000 Binary files a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User$_Fields.class b/Dozentenmodulserver/bin/server/User$_Fields.class deleted file mode 100644 index 191396fc..00000000 Binary files a/Dozentenmodulserver/bin/server/User$_Fields.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/User.class b/Dozentenmodulserver/bin/server/User.class deleted file mode 100644 index e76e61f2..00000000 Binary files a/Dozentenmodulserver/bin/server/User.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class deleted file mode 100644 index 9788373f..00000000 Binary files a/Dozentenmodulserver/bin/server/startServer.class and /dev/null differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 03c89341..a2eef5cb 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 6e630387..af526905 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -32,6 +32,8 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sql.SQL; + public class Server { public interface Iface { @@ -442,6 +444,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result"); } + public boolean deleteImageData(String imageid, String imageversion) { + + SQL sql = new SQL(); + + return sql.deleteImage( imageid, imageversion); + } + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { @@ -14281,7 +14290,8 @@ public class Server { } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getLectureData_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, getLectureData_result struct) throws + org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { @@ -14300,8 +14310,11 @@ public class Server { struct.setSuccessIsSet(true); } } + } } + + } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index d50c65a9..c3abd69c 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -303,5 +303,5 @@ public class ServerHandler implements Server.Iface { return null; } - + } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index f28fdd67..ca3f0f8e 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -326,4 +326,36 @@ public class SQL { } return -1; } + + + /** + * + * @param id + * @param version + * @return + */ + + public boolean deleteImage(String id, String version) { + + try { + + Connection con=DriverManager.getConnection + ("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=slx-ng-open"); + Statement stm=con.createStatement(); + + System.out.println("delete image"); + + stm.executeUpdate("DELETE * FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + + "and imageVersion = '"+version+"' ;"); + + return true; + + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return false; + } + } diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 8f845bff..068a7230 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -46,4 +46,5 @@ service Server{ map getImageData(string imageid, string imageversion), bool updateImageData(string name, string newName,bool license, bool internet, int ram,int cpu, string id, string version), map getLectureData(string lecturename), + bool deleteImageData(string id, string version), } \ No newline at end of file -- cgit v1.2.3-55-g7522 From 7da7e48ffc076b0995dc50c6a3cc78790083759d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 09:41:42 +0200 Subject: rgethgdfb --- Dozentenmodul/bin/gui/DeleteImage_GUI.class | Bin 0 -> 11761 bytes Dozentenmodul/src/gui/DeleteImage_GUI.java | 525 ++++++++++++++++++++++++++++ 2 files changed, 525 insertions(+) create mode 100644 Dozentenmodul/bin/gui/DeleteImage_GUI.class create mode 100644 Dozentenmodul/src/gui/DeleteImage_GUI.java diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/DeleteImage_GUI.class new file mode 100644 index 00000000..26ec2ee4 Binary files /dev/null and b/Dozentenmodul/bin/gui/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/DeleteImage_GUI.java b/Dozentenmodul/src/gui/DeleteImage_GUI.java new file mode 100644 index 00000000..7ee5209b --- /dev/null +++ b/Dozentenmodul/src/gui/DeleteImage_GUI.java @@ -0,0 +1,525 @@ +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 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","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 { + 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 + 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 btnDelete = new JButton("L\u00F6schen"); + btnDelete.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + + int index; + String id; + String version; + + //Öffnet den Downloader + /*FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); + down.setVisible(true); + DeleteImage_GUI.this.setVisible(false); + */ + + + + + //frage, soll das selektierte Daten gelöscht werden? + int eingabe = JOptionPane.showConfirmDialog(null, + "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); + if (eingabe == JOptionPane.YES_OPTION) { + //Wenn ja, dann daten selektieren und löschen + // Element in der Datenbank selektieren und löschen + //Login l = new Login(); + //l.createAndShowUI(); + //System.exit(0); + // client. deleteimage... + + //getSelectedRow(); + + //index = tableAllImages.getSelectedRow(); + + //rowSorterAll ? + + + + String imageid = modelAll.getValueAt(tableAllImages.convertRowIndexToModel + (tableAllImages.getSelectedRow()), 7).toString(); + + String imageversion = modelAll.getValueAt(tableAllImages.convertRowIndexToModel + (tableAllImages.getSelectedRow()), 8).toString(); + //client.deleteImageData(Image.image.getImageId(),Image.image.getVersion()); + + if (client.deleteImageData(imageid ,imageversion)) { + + JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", + imageversion, JOptionPane.OK_CANCEL_OPTION); + + } else { + + JOptionPane.showConfirmDialog(null, "Löschen hat leider nicht geklappt!!", + imageversion, JOptionPane.OK_CANCEL_OPTION); + + } + } + } + }); + 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 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; + } + + } + + -- cgit v1.2.3-55-g7522 From 8c4c1a9a113f37ff5c88ad72d27619f9924b66e8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 15:50:48 +0200 Subject: cdsc --- .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12312 -> 12312 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 9974 -> 9974 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 11868 -> 11868 bytes .../gui/lecture/CreateLectureAllgemein_GUI$6.class | Bin 3062 -> 3105 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10794 -> 10794 bytes .../src/gui/image/FTPCreateUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 4 ++-- .../src/gui/image/FTPEditUploader_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 1 + 9 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index bf24ef25..785ecb6b 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index 97b76e5c..dca740f2 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 71d93a4a..d3571c94 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class index e4b01d60..adcc7fd5 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 8bbcc3d0..031b69b7 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index cd952d0f..1bf8cc3a 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -50,8 +50,8 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + //String host = "141.79.128.121"; + String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 2ace42c6..d0f789f4 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -45,8 +45,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + //String host = "141.79.128.121"; + String host = "141.79.128.102"; int port = 21; String downloadFile = ""; static String arg = ""; diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index a23e85d2..b184c96c 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -49,8 +49,8 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.121"; - //String host = "141.79.128.102"; + //String host = "141.79.128.121"; + String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 936f9b13..026cb7c5 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -412,6 +412,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { "Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n" + endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); + dateChooserend.setDate(endDate); //setze Datum auf maximum } else { // bereit isDateMaxLifeTimeCorrect = true; -- cgit v1.2.3-55-g7522 From 558baa3fa1a2855af2950b6be59d91b197781817 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 16:45:48 +0200 Subject: bfg --- Dozentenmodul/src/GUI/SearchImage_GUI.java | 906 ++++++------- Dozentenmodul/src/Models/person.java | 124 +- Dozentenmodul/src/Models/vm.java | 138 +- Dozentenmodul_V1/.classpath | 17 - Dozentenmodul_V1/.project | 36 - Dozentenmodul_V1/.settings/.jsdtscope | 12 - .../.settings/org.eclipse.jdt.core.prefs | 11 - .../.settings/org.eclipse.wst.common.component | 8 - .../org.eclipse.wst.common.project.facet.core.xml | 10 - .../org.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp | 47 - .../WebContent/GUI/de/ESXI_Redirection.jsp | 37 - Dozentenmodul_V1/WebContent/GUI/de/Home.jsp | 87 -- Dozentenmodul_V1/WebContent/GUI/de/Login.jsp | 34 - Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp | 12 - Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp | 20 - Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp | 41 - .../WebContent/GUI/de/VL_bearbeiten.jsp | 12 - .../WebContent/GUI/de/createVL_Software.jsp | 109 -- .../WebContent/GUI/de/createVL_System.jsp | 146 --- .../WebContent/GUI/de/createVL_allgemein.jsp | 97 -- Dozentenmodul_V1/WebContent/GUI/de/footer.html | 7 - Dozentenmodul_V1/WebContent/GUI/de/header.html | 7 - Dozentenmodul_V1/WebContent/GUI/de/news.jsp | 15 - Dozentenmodul_V1/WebContent/GUI/en/Home.jsp | 12 - Dozentenmodul_V1/WebContent/GUI/en/Login.jsp | 42 - Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp | 12 - Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF | 3 - .../WebContent/UbuntuFonts/Ubuntu-B.ttf | Bin 333616 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-BI.ttf | Bin 356980 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-C.ttf | Bin 350420 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-L.ttf | Bin 415552 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-LI.ttf | Bin 409608 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-M.ttf | Bin 341324 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-MI.ttf | Bin 366992 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-R.ttf | Bin 353824 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-RI.ttf | Bin 386440 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-B.ttf | Bin 191400 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-BI.ttf | Bin 216208 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-R.ttf | Bin 205748 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-RI.ttf | Bin 210216 -> 0 bytes Dozentenmodul_V1/WebContent/WEB-INF/web.xml | 7 - Dozentenmodul_V1/WebContent/css/Input.css | 124 -- Dozentenmodul_V1/WebContent/css/Layout.css | 196 --- Dozentenmodul_V1/WebContent/css/Login.css | 116 -- Dozentenmodul_V1/WebContent/img/Calendar/cal.gif | Bin 127 -> 0 bytes .../WebContent/img/Calendar/cal_close.gif | Bin 874 -> 0 bytes .../WebContent/img/Calendar/cal_fastforward.gif | Bin 62 -> 0 bytes .../WebContent/img/Calendar/cal_fastreverse.gif | Bin 63 -> 0 bytes .../WebContent/img/Calendar/cal_forward.gif | Bin 57 -> 0 bytes .../WebContent/img/Calendar/cal_minus.gif | Bin 48 -> 0 bytes .../WebContent/img/Calendar/cal_plus.gif | Bin 47 -> 0 bytes .../WebContent/img/Calendar/cal_reverse.gif | Bin 57 -> 0 bytes Dozentenmodul_V1/WebContent/img/DeleteRed.png | Bin 928 -> 0 bytes .../WebContent/img/Logo_bwLehrpool.png | Bin 29052 -> 0 bytes Dozentenmodul_V1/WebContent/img/Pencil3.png | Bin 800 -> 0 bytes .../WebContent/img/Shutdown_Box_Red.png | Bin 3581 -> 0 bytes Dozentenmodul_V1/WebContent/img/bg.png | Bin 273 -> 0 bytes Dozentenmodul_V1/WebContent/img/de.png | Bin 545 -> 0 bytes Dozentenmodul_V1/WebContent/img/tabbg.gif | Bin 68 -> 0 bytes Dozentenmodul_V1/WebContent/img/tabbg2.gif | Bin 252 -> 0 bytes Dozentenmodul_V1/WebContent/img/us.png | Bin 609 -> 0 bytes .../WebContent/jar/jakarta-commons-net.jar | Bin 239350 -> 0 bytes .../WebContent/jar/jakarta-commons-oro.jar | Bin 73481 -> 0 bytes Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar | Bin 343591 -> 0 bytes .../WebContent/js/datetimepicker_css.js | 1341 -------------------- Dozentenmodul_V1/WebContent/js/functions.js | 31 - Dozentenmodul_V1/WebContent/js/login.js | 9 - Dozentenmodul_V1/WebContent/js/tabcontent.js | 171 --- Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp | 47 - .../bin/WebContent/GUI/de/ESXI_Redirection.jsp | 37 - Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp | 87 -- Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp | 34 - .../bin/WebContent/GUI/de/Login_Error.jsp | 12 - Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp | 20 - .../bin/WebContent/GUI/de/VLUpload.jsp | 41 - .../bin/WebContent/GUI/de/VL_bearbeiten.jsp | 12 - .../bin/WebContent/GUI/de/createVL_Software.jsp | 109 -- .../bin/WebContent/GUI/de/createVL_System.jsp | 146 --- .../bin/WebContent/GUI/de/createVL_allgemein.jsp | 97 -- Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html | 7 - Dozentenmodul_V1/bin/WebContent/GUI/de/header.html | 7 - Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp | 15 - .../build/classes/authentifizierung/Ldap.class | Bin 3578 -> 0 bytes Dozentenmodul_V1/build/classes/db/DB_Access.class | Bin 1648 -> 0 bytes Dozentenmodul_V1/build/classes/db/MySQL.class | Bin 5318 -> 0 bytes Dozentenmodul_V1/build/classes/db/SaveOS.class | Bin 2080 -> 0 bytes Dozentenmodul_V1/build/classes/news/News.class | Bin 1577 -> 0 bytes Dozentenmodul_V1/src/authentifizierung/Ldap.java | 98 -- Dozentenmodul_V1/src/db/DB_Access.java | 57 - Dozentenmodul_V1/src/db/MySQL.java | 203 --- Dozentenmodul_V1/src/db/SaveOS.java | 66 - Dozentenmodul_V1/src/news/News.java | 43 - 94 files changed, 584 insertions(+), 4553 deletions(-) delete mode 100644 Dozentenmodul_V1/.classpath delete mode 100644 Dozentenmodul_V1/.project delete mode 100644 Dozentenmodul_V1/.settings/.jsdtscope delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.common.component delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Home.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Login.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/footer.html delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/header.html delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/news.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Home.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Login.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/WEB-INF/web.xml delete mode 100644 Dozentenmodul_V1/WebContent/css/Input.css delete mode 100644 Dozentenmodul_V1/WebContent/css/Layout.css delete mode 100644 Dozentenmodul_V1/WebContent/css/Login.css delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/DeleteRed.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Pencil3.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png delete mode 100644 Dozentenmodul_V1/WebContent/img/bg.png delete mode 100644 Dozentenmodul_V1/WebContent/img/de.png delete mode 100644 Dozentenmodul_V1/WebContent/img/tabbg.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/tabbg2.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/us.png delete mode 100644 Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar delete mode 100644 Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar delete mode 100644 Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar delete mode 100644 Dozentenmodul_V1/WebContent/js/datetimepicker_css.js delete mode 100644 Dozentenmodul_V1/WebContent/js/functions.js delete mode 100644 Dozentenmodul_V1/WebContent/js/login.js delete mode 100644 Dozentenmodul_V1/WebContent/js/tabcontent.js delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/header.html delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp delete mode 100644 Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class delete mode 100644 Dozentenmodul_V1/build/classes/db/DB_Access.class delete mode 100644 Dozentenmodul_V1/build/classes/db/MySQL.class delete mode 100644 Dozentenmodul_V1/build/classes/db/SaveOS.class delete mode 100644 Dozentenmodul_V1/build/classes/news/News.class delete mode 100644 Dozentenmodul_V1/src/authentifizierung/Ldap.java delete mode 100644 Dozentenmodul_V1/src/db/DB_Access.java delete mode 100644 Dozentenmodul_V1/src/db/MySQL.java delete mode 100644 Dozentenmodul_V1/src/db/SaveOS.java delete mode 100644 Dozentenmodul_V1/src/news/News.java diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java index ad474768..4225a295 100644 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java @@ -1,453 +1,453 @@ -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 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"); - 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("Test"); - 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 okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - 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) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_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); - - } - //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; - } - - } - - +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 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"); + 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("Test"); + 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 okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //Öffnet das Hauptmenü + 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) { + + EditImageAllgemein_GUI ea=new EditImageAllgemein_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); + + } + //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/Models/person.java b/Dozentenmodul/src/Models/person.java index c106ec12..f4dd5c22 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -1,62 +1,62 @@ -package models; - - -public class person{ - - private String Name; - private String Vorname; - private String Hochschule; - private String EMail; - private String Tel; - private String Fakultät; - private boolean ischecked; - - - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); - - public String getName() { - return Name; - } - public void setName(String name) { - Name = name; - } - public String getVorname() { - return Vorname; - } - public void setVorname(String vorname) { - Vorname = vorname; - } - public String getHochschule() { - return Hochschule; - } - public void setHochschule(String hochschule) { - Hochschule = hochschule; - } - public String getEMail() { - return EMail; - } - public void setEMail(String eMail) { - EMail = eMail; - } - public String getTel() { - return Tel; - } - public void setTel(String tel) { - Tel = tel; - } - public String getFakultät() { - return Fakultät; - } - public void setFakultät(String fakultät) { - Fakultät = fakultät; - } - public boolean isIschecked() { - return ischecked; - } - public void setIschecked(boolean ischecked) { - this.ischecked = ischecked; - } - - -} +package models; + + +public class person{ + + private String Name; + private String Vorname; + private String Hochschule; + private String EMail; + private String Tel; + private String Fakultät; + private boolean ischecked; + + + public static person verantowrtlicher=new person(); + public static person ersteller=new person(); + + public String getName() { + return Name; + } + public void setName(String name) { + Name = name; + } + public String getVorname() { + return Vorname; + } + public void setVorname(String vorname) { + Vorname = vorname; + } + public String getHochschule() { + return Hochschule; + } + public void setHochschule(String hochschule) { + Hochschule = hochschule; + } + public String getEMail() { + return EMail; + } + public void setEMail(String eMail) { + EMail = eMail; + } + public String getTel() { + return Tel; + } + public void setTel(String tel) { + Tel = tel; + } + public String getFakultät() { + return Fakultät; + } + public void setFakultät(String fakultät) { + Fakultät = fakultät; + } + public boolean isIschecked() { + return ischecked; + } + public void setIschecked(boolean ischecked) { + this.ischecked = ischecked; + } + + +} diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java index 07074cf9..34f9ffaa 100644 --- a/Dozentenmodul/src/Models/vm.java +++ b/Dozentenmodul/src/Models/vm.java @@ -1,69 +1,69 @@ -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; - } - - -} +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_V1/.classpath b/Dozentenmodul_V1/.classpath deleted file mode 100644 index 146da894..00000000 --- a/Dozentenmodul_V1/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Dozentenmodul_V1/.project b/Dozentenmodul_V1/.project deleted file mode 100644 index 29247cd1..00000000 --- a/Dozentenmodul_V1/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - Dozentenmodul_V1 - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/Dozentenmodul_V1/.settings/.jsdtscope b/Dozentenmodul_V1/.settings/.jsdtscope deleted file mode 100644 index 887f573a..00000000 --- a/Dozentenmodul_V1/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs b/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 838bd9d6..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component b/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 4bb00e74..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml b/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 518a3cac..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container b/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name b/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp deleted file mode 100644 index 58e83fe6..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -Betriebssystem hinzufügen - - -

Betriebssystem hinzufügen

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Hersteller des Betriebssystems:
Name des Betriebssystems:
Version des Betriebssystems:
Architektur des Betriebssystems:
Art des Betriebssystems:
- -
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp b/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp deleted file mode 100644 index 06223d4b..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Home - -

-
-

Zur weiteren Bearbeitung ihrer virtuellen Laborumgebung benötigen Sie die Anwendung "vSphere Client".

-

Diese finden Sie unter folgendem Link:

-

vSphere CLient

-
-

Ist die Software bereits installiert, starten Sie diese und geben Sie folgende Verbindungsdaten ein:

- - - - - - - - - - -
Benutzername: <Ihr BWIDM-Benutzername>
Passwort: <Ihr BWIDM-Passwort>
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp deleted file mode 100644 index 138f7094..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp +++ /dev/null @@ -1,87 +0,0 @@ - - -<%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - -Home - - - - - - - - - - -
-

Aktive VLs

-
    - <% - MySQL sql=new MySQL(); - Connection con= sql.getConnection(); - - ResultSet u=sql.getUserpk(con, "tobias.spitzer@hs-offenburg.de"); - - while(u.next()) - { - - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getActiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - <% - } - } - } - %> -
-

Inaktive VLs

-
    - - <% - while(u.next()) - { - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> - -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - - <% - } - } - } - - %> - - -
-
- - - - - - diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp deleted file mode 100644 index e5fc6ec1..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -Login Dozentenmodul - - -
-de de | en us -
- - - -
-
- - - - - - - - - - -
-
- - - - - diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp deleted file mode 100644 index d3e01215..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp deleted file mode 100644 index bec3f28e..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -OTRS - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp b/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp deleted file mode 100644 index 328f6efb..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -VL Upload Bereich - - - - - - -
-
- Sie sind hier: Allgemein - > - System - > - Software - > - Upload -
-

-

Upload Tool

- - - - - - - -
- - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp b/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp deleted file mode 100644 index 79087358..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp deleted file mode 100644 index 979ca401..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp +++ /dev/null @@ -1,109 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - - Insert title here - - - - - - - - - - <% - String Laborname=request.getParameter("Laborname"); - session.setAttribute("Laborname", Laborname); - - String shortDesc=request.getParameter("shortDesc"); - session.setAttribute("shortDesc", shortDesc); - - String longDesc=request.getParameter("longDesc"); - session.setAttribute("longDesc", longDesc); - - String comment=request.getParameter("comment"); - session.setAttribute("comment", comment); - - String OS=request.getParameter("OS"); - session.setAttribute("OS", OS); - - String von_date=request.getParameter("von_date"); - session.setAttribute("von_date", von_date); - - String bis_date=request.getParameter("bis_date"); - session.setAttribute("bis_date", bis_date); - %> -
-
- Sie sind hier: - Allgemein - > - System - > - Software -
-
-
-

- Sortierung nach: -

-
- Verfügbare Software -
- - <% - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - ResultSet h=sql.getHersteller(con); - int i=0; - while(h.next()) - { - ResultSet sw=sql.getSoftware(con, h.getString("Name")); - - - %> -
- <% - while(sw.next()) - { - int id=i++; - %> - <%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %> -
- <% - } - } - %> - -
-
-
- Ausgewählte Software -
- -
-
-
-

- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp deleted file mode 100644 index f780302f..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp +++ /dev/null @@ -1,146 +0,0 @@ -<%@page import="org.apache.catalina.Session"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - -Insert title here - - - - - - - - - - <% - String Vorname_V=request.getParameter("Vorname_V"); - session.setAttribute("Vorname_V",Vorname_V ); - - String Nachname_V=request.getParameter("Nachname_V"); - session.setAttribute("Nachname_V",Nachname_V ); - - String Hochschule_V=request.getParameter("Hochschule_V"); - session.setAttribute("Hochschule_V",Hochschule_V ); - - String Email_V=request.getParameter("Email_V"); - session.setAttribute("Email_V",Email_V ); - - String Tel_V=request.getParameter("Tel_V"); - session.setAttribute("Tel_V",Tel_V ); - - String Fakultät_V=request.getParameter("Fakultät_V"); - session.setAttribute("Fakultät_V",Fakultät_V ); - - String Vorname_E=request.getParameter("Vorname_E"); - session.setAttribute("Vorname_E",Vorname_E ); - - String Nachname_E=request.getParameter("Nachname_E"); - session.setAttribute("Nachname_E",Nachname_E ); - - String Hochschule_E=request.getParameter("Hochschule_E"); - session.setAttribute("Hochschule_E",Hochschule_E ); - - String Email_E=request.getParameter("Email_E"); - session.setAttribute("Email_E",Email_E ); - - String Tel_E=request.getParameter("Tel_E"); - session.setAttribute("Tel_E",Tel_E ); - - String Fakultät_E=request.getParameter("Fakultät_E"); - session.setAttribute("Fakultät_E",Fakultät_E ); - %> -
-
- Sie sind hier: - Allgemein - > - System - -
-
-
-
- Systeminformationen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Laborname (Anzeigename): *
Kurzbeschreibung: *
Langbeschreibung: *
Kommentar:
Betriebssystem: *
Gültigkeitsdatum: *von: bis: - -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp deleted file mode 100644 index 6e099ed9..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp +++ /dev/null @@ -1,97 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Insert title here - - - - - -
-
- Sie sind hier: - Allgemein - -
-
-
-
- Allgemeine Informationen zum Verantwortlichen - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-

-
- Allgemeine Informationen zum Ersteller - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-
- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/WebContent/GUI/de/footer.html deleted file mode 100644 index ce63d776..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/header.html b/Dozentenmodul_V1/WebContent/GUI/de/header.html deleted file mode 100644 index 83b3ab26..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/header.html +++ /dev/null @@ -1,7 +0,0 @@ - -
-de de | en us -
- - -
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/WebContent/GUI/de/news.jsp deleted file mode 100644 index 0104164d..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/news.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page language="java" import="news.News" %> -
-<% - News news=new News(); -String text=""; - - text=news.refreshNews(); - -%> -

News

-

-<%=text.toString() %> -

- -
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp deleted file mode 100644 index d3bec631..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

test

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp deleted file mode 100644 index f3568c67..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Login - -

-
-

Herzlich Willkommen im Dozentenmodul des bwLerhpools!

-

blablabla

- -
- - - - - - - - - - - - - -
Passwort:
-
- - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp deleted file mode 100644 index d3e01215..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF b/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 5e949512..00000000 --- a/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf deleted file mode 100644 index c0142fea..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf deleted file mode 100644 index 12e4c7df..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf deleted file mode 100644 index 8d3e8676..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf deleted file mode 100644 index 7b7ac7dd..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf deleted file mode 100644 index e36de452..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf deleted file mode 100644 index 443ec8b7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf deleted file mode 100644 index 321eccf7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf deleted file mode 100644 index 45a038ba..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf deleted file mode 100644 index 6f819f69..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf deleted file mode 100644 index 7bd66657..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf deleted file mode 100644 index 6c5b8ba0..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf deleted file mode 100644 index fdd309d7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf deleted file mode 100644 index 18f81a29..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml b/Dozentenmodul_V1/WebContent/WEB-INF/web.xml deleted file mode 100644 index 55db46a3..00000000 --- a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Dozentenmodul_V1 - - Login.jsp - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/css/Input.css b/Dozentenmodul_V1/WebContent/css/Input.css deleted file mode 100644 index 7a29a5e7..00000000 --- a/Dozentenmodul_V1/WebContent/css/Input.css +++ /dev/null @@ -1,124 +0,0 @@ -@CHARSET "ISO-8859-1"; - -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - - - -article.input section { - position: absolute; - display: block; - width: 80%; - height: 120%; - top: 200px; - left: 50%; - margin-left: -30%; - background-color: #c5d2de; -} - -article.input section h2 { - position: absolute; - left: 0; - top: -30px; - width: 124px; - height: 29px; - font-family: Ubuntu; - font-size: 15px; - margin: 0; - background-color: #194b7d; - border-radius: 15px 15px 0 0; - border: solid #ffffff; - border-width: 1px 1px 0 0; - z-index: 1; -} - -article.input section:nth-child(2) h2 { - left: 120px; - z-index: 0; -} - -article.input section:nth-child(3) h2 { - left: 240px; - z-index: -1; -} - -article.input section:nth-child(4) h2 { - left: 360px; - z-index: -2; -} - - -article.input section h2 a { - display: block; - margin: 5px 0 0 0; - text-align: center; - text-decoration: none; - color: #c5d2de; -} - -article.input section:target, article.input section:target h2 { - color: #000000; - background-color: #c5d2de; - z-index: 1; -} - -article.input section:target h2 a { - color: #194b7d; -} - -article.input section div{ - z-index: 1; -} - -article.input section input{ - width: 100%; -} - - - -article.input section input{ - width: 320px; -} - -article.input section textarea{ - width: 320px; - resize:none; -} -article.input section select{ - width: 325px; -} -td{ - -font-family:Ubuntu; -} -legend{ -font-family:Ubuntu; -} -p{ -font-family:Ubuntu; -} -#von_date, #bis_date{ - width: 300px; -} - -#aktiv_ja, #aktiv_nein{ - width: 50px; -} - - - - -#SW_list{ - width: 30px; -} - - - -} -#save{ - float:right; - margin-right: 30px; - width: 100px; -} \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/css/Layout.css b/Dozentenmodul_V1/WebContent/css/Layout.css deleted file mode 100644 index 75703ac4..00000000 --- a/Dozentenmodul_V1/WebContent/css/Layout.css +++ /dev/null @@ -1,196 +0,0 @@ -@CHARSET "ISO-8859-1"; -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - -html,body{ - - background-image:url('../img/bg.png'); - background-repeat:repeat-x; - font-family: 'Ubuntu'; -} - -button{ - font-family: 'Ubuntu'; -} - -#lang{ - position: absolute; - top: 0px; - right: 10px; -} - -#logo{ - width: 220px; -} - -#news{ - position:relative; - left: 0px; - list-style: none; - padding: 10px; - width: 200px; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: black; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: white; -} - -#newstext{ - position:relative; - margin-top: 10px; -} -/* Vertical List: */ -.vertical-list { - list-style: none; - padding: 10px; - width: 200px; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: black; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: white; /* old browsers */ - -} -.vertical-list .button { - outline: 0; - padding: 5px 12px; - display: block; - color: white; - font-family: 'Ubuntu'; - font-weight: bold; - text-shadow: 1px 1px #1f272b; - text-decoration: none; - border: 1px solid #1c252b; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - background: rgb(117,117,117); - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: background: rgb(117,117,117); /* old browsers */ -} -.vertical-list .button:hover { - background: rgb(255,166,38); /* old browsers */ - -} -.vertical-list .button:active { - background-position: 0 top; - position: relative; - top: 1px; - color: #fff; - padding: 6px 12px 4px; - background: rgb(255,166,38); - -} -#footer{ - width:80%; - height:3%; - background-color: #757575; - position: absolute; - bottom: 0px; - left: 300px; - -moz-border-radius: 25px 25px 0px 0px; - -webkit-border-radius: 25px 25px 0px 0px; - border-radius: 25px 25px 0px 0px; -} - - -#link{ - color:white; - font-family: 'Ubuntu'; - position: relative; - margin-left: 30px; -} - -#link:hover{ - color: #FFA626; -} -#content{ - position:absolute; - left: 300px; - top: 100px; - width:80%; - height:80%; - overflow-y: scroll; - -} - -#bread a:hover { - text-decoration:none; -} - -#bread a:hover { - text-decoration:underline; -} - -#buttonweiterAllg{ - position: absolute; - left: 200px; - width: 200px; -} - -#buttonweiterSys{ - position: absolute; - left: 500px; - width: 200px; -} - -#buttonReady{ - position: absolute; - left: 200px; - width: 200px; -} -#buttonBackAllg{ - position: absolute; - left: 0px; - width: 200px; -} -#buttonBackSys{ - position: absolute; - left: 300px; - width: 200px; -} -#buttonAddSW{ - left: 0px; - width: 200px; -} -#buttonBackSW{ - position: absolute; - left: 0px; - width: 200px; -} -#sw_chooser{ - width: 310px; -} -#sw_choosed{ - position: relative; - margin-left: 350px; - margin-top: -593px; - width:310px; - - -} - -#sort{ - margin-left: 10px; - margin-top: 10px; -} - -fieldset{ - margin-top: 10px; - -} -.container { - border:2px solid #ccc; - width:300px; - height: 550px; - overflow-y: scroll; -} diff --git a/Dozentenmodul_V1/WebContent/css/Login.css b/Dozentenmodul_V1/WebContent/css/Login.css deleted file mode 100644 index 3e85c647..00000000 --- a/Dozentenmodul_V1/WebContent/css/Login.css +++ /dev/null @@ -1,116 +0,0 @@ -@CHARSET "ISO-8859-1"; - -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - -#lang{ - position: absolute; - top: 0px; - right: 0px; -} - -#logo{ - width:50%; - height: 10%; - display:block; - margin-left: auto; - margin-right: auto; - margin-top: 5%; - -} - -#login{ - width:500px; - height:200px; - background-color: #757575; - display:block; - margin-left: auto; - margin-right: auto; - margin-top: 5%; - color: white; - font-family: 'Ubuntu'; - -moz-border-radius: 25px; - -webkit-border-radius: 25px; - border-radius: 25px; -} - -input{ - width:145px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -button{ - width:150px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -#lefttop{ - position:relative; - float:left; - margin-top: 25px; - margin-left: 15px; - -} - -#righttop{ - position: relative; - width:250px; - float:right; - margin-top: 25px; - margin-right: 15px; -} - -#leftbottom{ - position:relative; - float:left; - margin-top: 15px; - margin-left: 15px; - -} - -#rightbottom{ - position: relative; - width:250px; - float:right; - margin-top: 15px; - margin-right: 15px; -} - -#buttoncenter{ - position: absolute; - width:150px; - right:auto; - left:auto; - - margin-top:125px; -} -#footer{ - width:80%; - height:3%; - background-color: #757575; - position: absolute; - bottom: 0px; - left:50%; - margin-left:-40%; - -moz-border-radius: 25px 25px 0px 0px; - -webkit-border-radius: 25px 25px 0px 0px; - border-radius: 25px 25px 0px 0px; -} - -a{ - color:white; - font-family: 'Ubuntu'; - position: relative; - margin-left: 30px; -} -a:hover{ - color: #FFA626; -} - - diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif deleted file mode 100644 index 8526cf5d..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif deleted file mode 100644 index 22b71eaf..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif deleted file mode 100644 index 885781bd..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif deleted file mode 100644 index db858c50..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif deleted file mode 100644 index 4d9c2333..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif deleted file mode 100644 index 2861f59f..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif deleted file mode 100644 index 5dc1a52c..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif deleted file mode 100644 index 6d51e3f1..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/DeleteRed.png b/Dozentenmodul_V1/WebContent/img/DeleteRed.png deleted file mode 100644 index 03e31706..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/DeleteRed.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png b/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png deleted file mode 100644 index b897d9f1..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Pencil3.png b/Dozentenmodul_V1/WebContent/img/Pencil3.png deleted file mode 100644 index 1686cc8c..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Pencil3.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png b/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png deleted file mode 100644 index 9477e47e..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/bg.png b/Dozentenmodul_V1/WebContent/img/bg.png deleted file mode 100644 index 6df2510e..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/bg.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/de.png b/Dozentenmodul_V1/WebContent/img/de.png deleted file mode 100644 index ac4a9773..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/de.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/tabbg.gif b/Dozentenmodul_V1/WebContent/img/tabbg.gif deleted file mode 100644 index ab5606de..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/tabbg.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/tabbg2.gif b/Dozentenmodul_V1/WebContent/img/tabbg2.gif deleted file mode 100644 index c46e39cc..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/tabbg2.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/us.png b/Dozentenmodul_V1/WebContent/img/us.png deleted file mode 100644 index 10f451fe..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/us.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar b/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar deleted file mode 100644 index a2880ab9..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar b/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar deleted file mode 100644 index 3a1cc642..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar b/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar deleted file mode 100644 index 0409e153..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js b/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js deleted file mode 100644 index 882601db..00000000 --- a/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js +++ /dev/null @@ -1,1341 +0,0 @@ -//Javasript name: My Date Time Picker -//Date created: 16-Nov-2003 23:19 -//Creator: TengYong Ng -//Website: http://www.rainforestnet.com -//Copyright (c) 2003 TengYong Ng -//FileName: DateTimePicker_css.js -//Version: 2.2.4 -// Note: Permission given to use and modify this script in ANY kind of applications if -// header lines are left unchanged. -//Permission is granted to redistribute and modify this javascript under a FreeBSD License. -//New Css style version added by Yvan Lavoie (Québec, Canada) 29-Jan-2009 -//Formatted for JSLint compatibility by Labsmedia.com (30-Dec-2010) - - -//Global variables - -var winCal; -var dtToday; -var Cal; -var MonthName; -var WeekDayName1; -var WeekDayName2; -var exDateTime;//Existing Date and Time -var selDate;//selected date. version 1.7 -var calSpanID = "calBorder"; // span ID -var domStyle = null; // span DOM object with style -var cnLeft = "0";//left coordinate of calendar span -var cnTop = "0";//top coordinate of calendar span -var xpos = 0; // mouse x position -var ypos = 0; // mouse y position -var calHeight = 0; // calendar height -var CalWidth = 208;// calendar width -var CellWidth = 30;// width of day cell. -var TimeMode = 24;// TimeMode value. 12 or 24 -var StartYear = 2013; //First Year in drop down year selection -var EndYear = 5; // The last year of pickable date. if current year is 2011, the last year that still picker will be 2016 (2011+5) -var CalPosOffsetX = -1; //X position offset relative to calendar icon, can be negative value -var CalPosOffsetY = 0; //Y position offset relative to calendar icon, can be negative value - -//Configurable parameters start -var SpanBorderColor = "#000000";//span border color -var SpanBgColor = "#FFFFFF"; //span background color -var MonthYearColor = "#cc0033"; //Font Color of Month and Year in Calendar header. -var WeekHeadColor = "#18861B"; //var WeekHeadColor="#18861B";//Background Color in Week header. -var SundayColor = "#C0F64F"; //var SundayColor="#C0F64F";//Background color of Sunday. -var SaturdayColor = "#C0F64F"; //Background color of Saturday. -var WeekDayColor = "#FFEDA6"; //Background color of weekdays. -var FontColor = "blue"; //color of font in Calendar day cell. -var TodayColor = "#ffbd35"; //var TodayColor="#FFFF33";//Background color of today. -var SelDateColor = "#8DD53C"; //var SelDateColor = "#8DD53C";//Backgrond color of selected date in textbox. -var YrSelColor = "#cc0033"; //color of font of Year selector. -var MthSelColor = "#cc0033"; //color of font of Month selector if "MonthSelector" is "arrow". -var HoverColor = "#E0FF38"; //color when mouse move over. -var DisableColor = "#999966"; //color of disabled cell. -var CalBgColor = "#ffffff"; //Background color of Calendar window. - -var WeekChar = 2;//number of character for week day. if 2 then Mo,Tu,We. if 3 then Mon,Tue,Wed. -var DateSeparator = "-";//Date Separator, you can change it to "-" if you want. -var ShowLongMonth = true;//Show long month name in Calendar header. example: "January". -var ShowMonthYear = true;//Show Month and Year in Calendar header. -var ThemeBg = "";//Background image of Calendar window. -var PrecedeZero = true;//Preceding zero [true|false] -var MondayFirstDay = true;//true:Use Monday as first day; false:Sunday as first day. [true|false] //added in version 1.7 -var UseImageFiles = true;//Use image files with "arrows" and "close" button -var imageFilesPath = "/Dozentenmodul_V1/img/Calendar/"; -//Configurable parameters end - -//use the Month and Weekday in your preferred language. -var MonthName = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; -var WeekDayName1 = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; -var WeekDayName2 = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]; - - -//end Configurable parameters - -//end Global variable - - -// Calendar prototype -function Calendar(pDate, pCtrl) -{ - //Properties - this.Date = pDate.getDate();//selected date - this.Month = pDate.getMonth();//selected month number - this.Year = pDate.getFullYear();//selected year in 4 digits - this.Hours = pDate.getHours(); - - if (pDate.getMinutes() < 10) - { - this.Minutes = "0" + pDate.getMinutes(); - } - else - { - this.Minutes = pDate.getMinutes(); - } - - if (pDate.getSeconds() < 10) - { - this.Seconds = "0" + pDate.getSeconds(); - } - else - { - this.Seconds = pDate.getSeconds(); - } - this.MyWindow = winCal; - this.Ctrl = pCtrl; - this.Format = "ddMMyyyy"; - this.Separator = DateSeparator; - this.ShowTime = false; - this.Scroller = "DROPDOWN"; - if (pDate.getHours() < 12) - { - this.AMorPM = "AM"; - } - else - { - this.AMorPM = "PM"; - } - this.ShowSeconds = false; - this.EnableDateMode = "" -} - -Calendar.prototype.GetMonthIndex = function (shortMonthName) -{ - for (var i = 0; i < 12; i += 1) - { - if (MonthName[i].substring(0, 3).toUpperCase() === shortMonthName.toUpperCase()) - { - return i; - } - } -}; - -Calendar.prototype.IncYear = function () { - if (Cal.Year <= dtToday.getFullYear()+EndYear) - Cal.Year += 1; -}; - -Calendar.prototype.DecYear = function () { - if (Cal.Year > StartYear) - Cal.Year -= 1; -}; - -Calendar.prototype.IncMonth = function() { - if (Cal.Year <= dtToday.getFullYear() + EndYear) { - Cal.Month += 1; - if (Cal.Month >= 12) { - Cal.Month = 0; - Cal.IncYear(); - } - } -}; - -Calendar.prototype.DecMonth = function() { - if (Cal.Year >= StartYear) { - Cal.Month -= 1; - if (Cal.Month < 0) { - Cal.Month = 11; - Cal.DecYear(); - } - } -}; - -Calendar.prototype.SwitchMth = function (intMth) -{ - Cal.Month = parseInt(intMth, 10); -}; - -Calendar.prototype.SwitchYear = function (intYear) -{ - Cal.Year = parseInt(intYear, 10); -}; - -Calendar.prototype.SetHour = function(intHour) { - var MaxHour, - MinHour, - HourExp = new RegExp("^\\d\\d"), - SingleDigit = new RegExp("^\\d{1}$"); - - if (TimeMode === 24) { - MaxHour = 23; - MinHour = 0; - } - else if (TimeMode === 12) { - MaxHour = 12; - MinHour = 1; - } - else { - alert("TimeMode can only be 12 or 24"); - } - - if ((HourExp.test(intHour) || SingleDigit.test(intHour)) && (parseInt(intHour, 10) > MaxHour)) { - intHour = MinHour; - } - - else if ((HourExp.test(intHour) || SingleDigit.test(intHour)) && (parseInt(intHour, 10) < MinHour)) { - intHour = MaxHour; - } - - intHour = parseInt(intHour, 10); - if (SingleDigit.test(intHour)) { - intHour = "0" + intHour; - } - - if (HourExp.test(intHour) && (parseInt(intHour, 10) <= MaxHour) && (parseInt(intHour, 10) >= MinHour)) { - if ((TimeMode === 12) && (Cal.AMorPM === "PM")) { - if (parseInt(intHour, 10) === 12) { - Cal.Hours = 12; - } - else { - Cal.Hours = parseInt(intHour, 10) + 12; - } - } - - else if ((TimeMode === 12) && (Cal.AMorPM === "AM")) { - if (intHour === 12) { - intHour -= 12; - } - - Cal.Hours = parseInt(intHour, 10); - } - - else if (TimeMode === 24) { - Cal.Hours = parseInt(intHour, 10); - } - } - -}; - -Calendar.prototype.SetMinute = function (intMin) -{ - var MaxMin = 59, - MinMin = 0, - - SingleDigit = new RegExp("\\d"), - SingleDigit2 = new RegExp("^\\d{1}$"), - MinExp = new RegExp("^\\d{2}$"), - - strMin = 0; - - if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) > MaxMin)) - { - intMin = MinMin; - } - - else if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) < MinMin)) - { - intMin = MaxMin; - } - - strMin = intMin + ""; - if (SingleDigit2.test(intMin)) - { - strMin = "0" + strMin; - } - - if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) <= 59) && (parseInt(intMin, 10) >= 0)) - { - Cal.Minutes = strMin; - } -}; - -Calendar.prototype.SetSecond = function (intSec) -{ - var MaxSec = 59, - MinSec = 0, - - SingleDigit = new RegExp("\\d"), - SingleDigit2 = new RegExp("^\\d{1}$"), - SecExp = new RegExp("^\\d{2}$"), - - strSec = 0; - - if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) > MaxSec)) - { - intSec = MinSec; - } - - else if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) < MinSec)) - { - intSec = MaxSec; - } - - strSec = intSec + ""; - if (SingleDigit2.test(intSec)) - { - strSec = "0" + strSec; - } - - if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) <= 59) && (parseInt(intSec, 10) >= 0)) - { - Cal.Seconds = strSec; - } - -}; - -Calendar.prototype.SetAmPm = function (pvalue) -{ - this.AMorPM = pvalue; - if (pvalue === "PM") - { - this.Hours = parseInt(this.Hours, 10) + 12; - if (this.Hours === 24) - { - this.Hours = 12; - } - } - - else if (pvalue === "AM") - { - this.Hours -= 12; - } -}; - -Calendar.prototype.getShowHour = function() { - var finalHour; - - if (TimeMode === 12) { - if (parseInt(this.Hours, 10) === 0) { - this.AMorPM = "AM"; - finalHour = parseInt(this.Hours, 10) + 12; - } - - else if (parseInt(this.Hours, 10) === 12) { - this.AMorPM = "PM"; - finalHour = 12; - } - - else if (this.Hours > 12) { - this.AMorPM = "PM"; - if ((this.Hours - 12) < 10) { - finalHour = "0" + ((parseInt(this.Hours, 10)) - 12); - } - else { - finalHour = parseInt(this.Hours, 10) - 12; - } - } - else { - this.AMorPM = "AM"; - if (this.Hours < 10) { - finalHour = "0" + parseInt(this.Hours, 10); - } - else { - finalHour = this.Hours; - } - } - } - - else if (TimeMode === 24) { - if (this.Hours < 10) { - finalHour = "0" + parseInt(this.Hours, 10); - } - else { - finalHour = this.Hours; - } - } - - return finalHour; -}; - -Calendar.prototype.getShowAMorPM = function () -{ - return this.AMorPM; -}; - -Calendar.prototype.GetMonthName = function (IsLong) -{ - var Month = MonthName[this.Month]; - if (IsLong) - { - return Month; - } - else - { - return Month.substr(0, 3); - } -}; - -Calendar.prototype.GetMonDays = function() { //Get number of days in a month - - var DaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; - if (Cal.IsLeapYear()) { - DaysInMonth[1] = 29; - } - - return DaysInMonth[this.Month]; -}; - -Calendar.prototype.IsLeapYear = function () -{ - if ((this.Year % 4) === 0) - { - if ((this.Year % 100 === 0) && (this.Year % 400) !== 0) - { - return false; - } - else - { - return true; - } - } - else - { - return false; - } -}; - -Calendar.prototype.FormatDate = function (pDate) -{ - var MonthDigit = this.Month + 1; - if (PrecedeZero === true) - { - if ((pDate < 10) && String(pDate).length===1) //length checking added in version 2.2 - { - pDate = "0" + pDate; - } - if (MonthDigit < 10) - { - MonthDigit = "0" + MonthDigit; - } - } - - switch (this.Format.toUpperCase()) - { - case "DDMMYYYY": - return (pDate + DateSeparator + MonthDigit + DateSeparator + this.Year); - case "DDMMMYYYY": - return (pDate + DateSeparator + this.GetMonthName(false) + DateSeparator + this.Year); - case "MMDDYYYY": - return (MonthDigit + DateSeparator + pDate + DateSeparator + this.Year); - case "MMMDDYYYY": - return (this.GetMonthName(false) + DateSeparator + pDate + DateSeparator + this.Year); - case "YYYYMMDD": - return (this.Year + DateSeparator + MonthDigit + DateSeparator + pDate); - case "YYMMDD": - return (String(this.Year).substring(2, 4) + DateSeparator + MonthDigit + DateSeparator + pDate); - case "YYMMMDD": - return (String(this.Year).substring(2, 4) + DateSeparator + this.GetMonthName(false) + DateSeparator + pDate); - case "YYYYMMMDD": - return (this.Year + DateSeparator + this.GetMonthName(false) + DateSeparator + pDate); - default: - return (pDate + DateSeparator + (this.Month + 1) + DateSeparator + this.Year); - } -}; - -// end Calendar prototype - -function GenCell(pValue, pHighLight, pColor, pClickable) -{ //Generate table cell with value - var PValue, - PCellStr, - PClickable, - vTimeStr; - - if (!pValue) - { - PValue = ""; - } - else - { - PValue = pValue; - } - - if (pColor === undefined) - pColor = CalBgColor; - - if (pClickable !== undefined){ - PClickable = pClickable; - } - else{ - PClickable = true; - } - - if (Cal.ShowTime) - { - vTimeStr = ' ' + Cal.Hours + ':' + Cal.Minutes; - if (Cal.ShowSeconds) - { - vTimeStr += ':' + Cal.Seconds; - } - if (TimeMode === 12) - { - vTimeStr += ' ' + Cal.AMorPM; - } - } - - else - { - vTimeStr = ""; - } - - if (PValue !== "") - { - if (PClickable === true) { - if (Cal.ShowTime === true) - { PCellStr = "" + PValue + ""; } - else { PCellStr = "" + PValue + ""; } - } - else - { PCellStr = ""+PValue+""; } - } - else - { PCellStr = " "; } - - return PCellStr; -} - -function RenderCssCal(bNewCal) -{ - if (typeof bNewCal === "undefined" || bNewCal !== true) - { - bNewCal = false; - } - var vCalHeader, - vCalData, - vCalTime = "", - vCalClosing = "", - winCalData = "", - CalDate, - - i, - j, - - SelectStr, - vDayCount = 0, - vFirstDay, - - WeekDayName = [],//Added version 1.7 - strCell, - - showHour, - ShowArrows = false, - HourCellWidth = "35px", //cell width with seconds. - - SelectAm, - SelectPm, - - funcCalback, - - headID, - e, - cssStr, - style, - cssText, - span; - - calHeight = 0; // reset the window height on refresh - - // Set the default cursor for the calendar - - winCalData = ""; - vCalHeader = ""; - - //Table for Month & Year Selector - - vCalHeader += ""; - - //******************End Month and Year selector in arrow****************************** - - //Calendar header shows Month and Year - if (ShowMonthYear && Cal.Scroller === "DROPDOWN") - { - vCalHeader += ""; - calHeight += 19; - } - - //Week day header - - vCalHeader += ""; - - - //Time picker - if (Cal.ShowTime === true) - { - showHour = Cal.getShowHour(); - - if (Cal.ShowSeconds === false && TimeMode === 24) - { - ShowArrows = true; - HourCellWidth = "10px"; - } - - vCalTime = ""; - calHeight += 31; - vCalClosing += "
"; - //******************Month and Year selector in dropdown list************************ - - if (Cal.Scroller === "DROPDOWN") - { - vCalHeader += ""; - //Year selector - - vCalHeader += "\n"; - calHeight += 30; - } - - //******************End Month and Year selector in dropdown list********************* - - //******************Month and Year selector in arrow********************************* - - else if (Cal.Scroller === "ARROW") - { - if (UseImageFiles) - { - vCalHeader += "\n";//Year scroller (decrease 1 year) - vCalHeader += "\n"; //Month scroller (decrease 1 month) - vCalHeader += ""; //Month and Year - vCalHeader += "\n"; //Month scroller (increase 1 month) - vCalHeader += "\n"; //Year scroller (increase 1 year) - calHeight += 22; - } - else - { - vCalHeader += "";//Year scroller (decrease 1 year) - vCalHeader += "\n";//Month scroller (decrease 1 month) - vCalHeader += "\n"; //Month and Year - vCalHeader += "\n";//Month scroller (increase 1 month) - vCalHeader += "\n";//Year scroller (increase 1 year) - calHeight += 22; - } - } - - vCalHeader += "
"+ Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + "-<" + Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + ">+
" + Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + "
"; - if (MondayFirstDay === true) - { - WeekDayName = WeekDayName2; - } - else - { - WeekDayName = WeekDayName1; - } - for (i = 0; i < 7; i += 1) - { - vCalHeader += ""; - } - - calHeight += 19; - vCalHeader += ""; - //Calendar detail - CalDate = new Date(Cal.Year, Cal.Month); - CalDate.setDate(1); - - vFirstDay = CalDate.getDay(); - - //Added version 1.7 - if (MondayFirstDay === true) - { - vFirstDay -= 1; - if (vFirstDay === -1) - { - vFirstDay = 6; - } - } - - //Added version 1.7 - vCalData = ""; - calHeight += 19; - for (i = 0; i < vFirstDay; i += 1) - { - vCalData = vCalData + GenCell(); - vDayCount = vDayCount + 1; - } - - //Added version 1.7 - for (j = 1; j <= Cal.GetMonDays(); j += 1) - { - if ((vDayCount % 7 === 0) && (j > 1)) - { - vCalData = vCalData + ""; - } - - vDayCount = vDayCount + 1; - //added version 2.1.2 - if (Cal.EnableDateMode === "future" && ((j < dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Month < dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Year < dtToday.getFullYear()))) - { - strCell = GenCell(j, false, DisableColor, false); //Before today's date is not clickable - } - else if (Cal.EnableDateMode === "past" && ((j >= dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Month > dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Year > dtToday.getFullYear()))) { - strCell = GenCell(j, false, DisableColor, false); //After today's date is not clickable - } - //if End Year + Current Year = Cal.Year. Disable. - else if (Cal.Year > (dtToday.getFullYear()+EndYear)) - { - strCell = GenCell(j, false, DisableColor, false); - } - else if ((j === dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear())) - { - strCell = GenCell(j, true, TodayColor);//Highlight today's date - } - else - { - if ((j === selDate.getDate()) && (Cal.Month === selDate.getMonth()) && (Cal.Year === selDate.getFullYear())){ - //modified version 1.7 - strCell = GenCell(j, true, SelDateColor); - } - else - { - if (MondayFirstDay === true) - { - if (vDayCount % 7 === 0) - { - strCell = GenCell(j, false, SundayColor); - } - else if ((vDayCount + 1) % 7 === 0) - { - strCell = GenCell(j, false, SaturdayColor); - } - else - { - strCell = GenCell(j, null, WeekDayColor); - } - } - else - { - if (vDayCount % 7 === 0) - { - strCell = GenCell(j, false, SaturdayColor); - } - else if ((vDayCount + 6) % 7 === 0) - { - strCell = GenCell(j, false, SundayColor); - } - else - { - strCell = GenCell(j, null, WeekDayColor); - } - } - } - } - - vCalData = vCalData + strCell; - - if ((vDayCount % 7 === 0) && (j < Cal.GetMonDays())) - { - vCalData = vCalData + ""; - calHeight += 19; - } - } - - // finish the table proper - - if (vDayCount % 7 !== 0) - { - while (vDayCount % 7 !== 0) - { - vCalData = vCalData + GenCell(); - vDayCount = vDayCount + 1; - } - } - - vCalData = vCalData + "
" + WeekDayName[i].substr(0, WeekChar) + "
"; - - if (ShowArrows && UseImageFiles) //this is where the up and down arrow control the hour. - { - vCalTime += "\n"; - } - - vCalTime += "\n\n"; - vCalTime += ""; - } - else //if not to show time. - { - vCalTime += "\n\n"; - } - else { - vCalClosing += "x"; - } - vCalClosing += ""; - } - vCalClosing += "
 
"; - vCalTime += ":"; - vCalTime += ""; - - if (Cal.ShowSeconds) - { - vCalTime += ":"; - vCalTime += ""; - } - - if (TimeMode === 12) - { - SelectAm = (Cal.AMorPM === "AM") ? "Selected" : ""; - SelectPm = (Cal.AMorPM === "PM") ? "Selected" : ""; - - vCalTime += ""; - vCalTime += ""; - } - - if (ShowArrows && UseImageFiles) //this is where the up and down arrow to change the "Minute". - { - vCalTime += "
"; - } - - vCalTime += "
 
"; - //close button - if (UseImageFiles) { - vCalClosing += "
\n"; - - //end time picker - funcCalback = "function callback(id, datum) {"; - funcCalback += " var CalId = document.getElementById(id);if (datum=== 'undefined') { var d = new Date(); datum = d.getDate() + '/' +(d.getMonth()+1) + '/' + d.getFullYear(); } window.calDatum=datum;CalId.value=datum;"; - funcCalback += " if(Cal.ShowTime){"; - funcCalback += " CalId.value+=' '+Cal.getShowHour()+':'+Cal.Minutes;"; - funcCalback += " if (Cal.ShowSeconds) CalId.value+=':'+Cal.Seconds;"; - funcCalback += " if (TimeMode === 12) CalId.value+=''+Cal.getShowAMorPM();"; - funcCalback += "}if(CalId.onchange!=undefined) CalId.onchange();CalId.focus();winCal.style.visibility='hidden';}"; - - - // determines if there is enough space to open the cal above the position where it is called - if (ypos > calHeight) - { - ypos = ypos - calHeight; - } - - if (!winCal) - { - headID = document.getElementsByTagName("head")[0]; - - // add javascript function to the span cal - e = document.createElement("script"); - e.type = "text/javascript"; - e.language = "javascript"; - e.text = funcCalback; - headID.appendChild(e); - // add stylesheet to the span cal - - cssStr = ".calTD {font-family: verdana; font-size: 12px; text-align: center; border:0; }\n"; - cssStr += ".calR {font-family: verdana; font-size: 12px; text-align: center; font-weight: bold;}"; - - style = document.createElement("style"); - style.type = "text/css"; - style.rel = "stylesheet"; - if (style.styleSheet) - { // IE - style.styleSheet.cssText = cssStr; - } - - else - { // w3c - cssText = document.createTextNode(cssStr); - style.appendChild(cssText); - } - - headID.appendChild(style); - // create the outer frame that allows the cal. to be moved - span = document.createElement("span"); - span.id = calSpanID; - span.style.position = "absolute"; - span.style.left = (xpos + CalPosOffsetX) + 'px'; - span.style.top = (ypos - CalPosOffsetY) + 'px'; - span.style.width = CalWidth + 'px'; - span.style.border = "solid 1pt " + SpanBorderColor; - span.style.padding = "0"; - span.style.cursor = "move"; - span.style.backgroundColor = SpanBgColor; - span.style.zIndex = 100; - document.body.appendChild(span); - winCal = document.getElementById(calSpanID); - } - - else - { - winCal.style.visibility = "visible"; - winCal.style.Height = calHeight; - - // set the position for a new calendar only - if (bNewCal === true) - { - winCal.style.left = (xpos + CalPosOffsetX) + 'px'; - winCal.style.top = (ypos - CalPosOffsetY) + 'px'; - } - } - - winCal.innerHTML = winCalData + vCalHeader + vCalData + vCalTime + vCalClosing; - return true; -} - - -function NewCssCal(pCtrl, pFormat, pScroller, pShowTime, pTimeMode, pShowSeconds, pEnableDateMode) -{ - // get current date and time - - dtToday = new Date(); - Cal = new Calendar(dtToday); - - if (pShowTime !== undefined) - { - if (pShowTime) { - Cal.ShowTime = true; - } - else { - Cal.ShowTime = false; - } - - if (pTimeMode) - { - pTimeMode = parseInt(pTimeMode, 10); - } - if (pTimeMode === 12 || pTimeMode === 24) - { - TimeMode = pTimeMode; - } - else - { - TimeMode = 24; - } - - if (pShowSeconds !== undefined) - { - if (pShowSeconds) - { - Cal.ShowSeconds = true; - } - else - { - Cal.ShowSeconds = false; - } - } - else - { - Cal.ShowSeconds = false; - } - - } - - if (pCtrl !== undefined) - { - Cal.Ctrl = pCtrl; - } - - if (pFormat!== undefined && pFormat !=="") - { - Cal.Format = pFormat.toUpperCase(); - } - else - { - Cal.Format = "MMDDYYYY"; - } - - if (pScroller!== undefined && pScroller!=="") - { - if (pScroller.toUpperCase() === "ARROW") - { - Cal.Scroller = "ARROW"; - } - else - { - Cal.Scroller = "DROPDOWN"; - } - } - - if (pEnableDateMode !== undefined && (pEnableDateMode === "future" || pEnableDateMode === "past")) { - Cal.EnableDateMode= pEnableDateMode; - } - - exDateTime = document.getElementById(pCtrl).value; //Existing Date Time value in textbox. - - if (exDateTime) - { //Parse existing Date String - var Sp1 = exDateTime.indexOf(DateSeparator, 0),//Index of Date Separator 1 - Sp2 = exDateTime.indexOf(DateSeparator, parseInt(Sp1, 10) + 1),//Index of Date Separator 2 - tSp1,//Index of Time Separator 1 - tSp2,//Index of Time Separator 2 - strMonth, - strDate, - strYear, - intMonth, - YearPattern, - strHour, - strMinute, - strSecond, - winHeight, - offset = parseInt(Cal.Format.toUpperCase().lastIndexOf("M"), 10) - parseInt(Cal.Format.toUpperCase().indexOf("M"), 10) - 1, - strAMPM = ""; - //parse month - - if (Cal.Format.toUpperCase() === "DDMMYYYY" || Cal.Format.toUpperCase() === "DDMMMYYYY") - { - if (DateSeparator === "") - { - strMonth = exDateTime.substring(2, 4 + offset); - strDate = exDateTime.substring(0, 2); - strYear = exDateTime.substring(4 + offset, 8 + offset); - } - else - { - if (exDateTime.indexOf("D*") !== -1) - { //DTG - strMonth = exDateTime.substring(8, 11); - strDate = exDateTime.substring(0, 2); - strYear = "20" + exDateTime.substring(11, 13); //Hack, nur für Jahreszahlen ab 2000 - } - else - { - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(0, Sp1); - strYear = exDateTime.substring(Sp2 + 1, Sp2 + 5); - } - } - } - - else if (Cal.Format.toUpperCase() === "MMDDYYYY" || Cal.Format.toUpperCase() === "MMMDDYYYY"){ - if (DateSeparator === ""){ - strMonth = exDateTime.substring(0, 2 + offset); - strDate = exDateTime.substring(2 + offset, 4 + offset); - strYear = exDateTime.substring(4 + offset, 8 + offset); - } - else{ - strMonth = exDateTime.substring(0, Sp1); - strDate = exDateTime.substring(Sp1 + 1, Sp2); - strYear = exDateTime.substring(Sp2 + 1, Sp2 + 5); - } - } - - else if (Cal.Format.toUpperCase() === "YYYYMMDD" || Cal.Format.toUpperCase() === "YYYYMMMDD") - { - if (DateSeparator === ""){ - strMonth = exDateTime.substring(4, 6 + offset); - strDate = exDateTime.substring(6 + offset, 8 + offset); - strYear = exDateTime.substring(0, 4); - } - else{ - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(Sp2 + 1, Sp2 + 3); - strYear = exDateTime.substring(0, Sp1); - } - } - - else if (Cal.Format.toUpperCase() === "YYMMDD" || Cal.Format.toUpperCase() === "YYMMMDD") - { - if (DateSeparator === "") - { - strMonth = exDateTime.substring(2, 4 + offset); - strDate = exDateTime.substring(4 + offset, 6 + offset); - strYear = exDateTime.substring(0, 2); - } - else - { - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(Sp2 + 1, Sp2 + 3); - strYear = exDateTime.substring(0, Sp1); - } - } - - if (isNaN(strMonth)){ - intMonth = Cal.GetMonthIndex(strMonth); - } - else{ - intMonth = parseInt(strMonth, 10) - 1; - } - if ((parseInt(intMonth, 10) >= 0) && (parseInt(intMonth, 10) < 12)) { - Cal.Month = intMonth; - } - //end parse month - - //parse year - YearPattern = /^\d{4}$/; - if (YearPattern.test(strYear)) { - if ((parseInt(strYear, 10)>=StartYear) && (parseInt(strYear, 10)<= (dtToday.getFullYear()+EndYear))) - Cal.Year = parseInt(strYear, 10); - } - //end parse year - - //parse Date - if ((parseInt(strDate, 10) <= Cal.GetMonDays()) && (parseInt(strDate, 10) >= 1)) { - Cal.Date = strDate; - } - //end parse Date - - //parse time - - if (Cal.ShowTime === true) - { - //parse AM or PM - if (TimeMode === 12) - { - strAMPM = exDateTime.substring(exDateTime.length - 2, exDateTime.length); - Cal.AMorPM = strAMPM; - } - - tSp1 = exDateTime.indexOf(":", 0); - tSp2 = exDateTime.indexOf(":", (parseInt(tSp1, 10) + 1)); - if (tSp1 > 0) - { - strHour = exDateTime.substring(tSp1, tSp1 - 2); - Cal.SetHour(strHour); - - strMinute = exDateTime.substring(tSp1 + 1, tSp1 + 3); - Cal.SetMinute(strMinute); - - strSecond = exDateTime.substring(tSp2 + 1, tSp2 + 3); - Cal.SetSecond(strSecond); - - } - else if (exDateTime.indexOf("D*") !== -1) - { //DTG - strHour = exDateTime.substring(2, 4); - Cal.SetHour(strHour); - strMinute = exDateTime.substring(4, 6); - Cal.SetMinute(strMinute); - - } - } - - } - selDate = new Date(Cal.Year, Cal.Month, Cal.Date);//version 1.7 - RenderCssCal(true); -} - -function closewin(id) { - if (Cal.ShowTime === true) { - var MaxYear = dtToday.getFullYear() + EndYear; - var beforeToday = - (Cal.Date < dtToday.getDate()) && - (Cal.Month === dtToday.getMonth()) && - (Cal.Year === dtToday.getFullYear()) - || - (Cal.Month < dtToday.getMonth()) && - (Cal.Year === dtToday.getFullYear()) - || - (Cal.Year < dtToday.getFullYear()); - - if ((Cal.Year <= MaxYear) && (Cal.Year >= StartYear) && (Cal.Month === selDate.getMonth()) && (Cal.Year === selDate.getFullYear())) { - if (Cal.EnableDateMode === "future") { - if (beforeToday === false) { - callback(id, Cal.FormatDate(Cal.Date)); - } - } - else - callback(id, Cal.FormatDate(Cal.Date)); - } - } - - var CalId = document.getElementById(id); - CalId.focus(); - winCal.style.visibility = 'hidden'; -} - -function changeBorder(element, col, oldBgColor) -{ - if (col === 0) - { - element.style.background = HoverColor; - element.style.borderColor = "black"; - element.style.cursor = "pointer"; - } - - else - { - if (oldBgColor) - { - element.style.background = oldBgColor; - } - else - { - element.style.background = "white"; - } - element.style.borderColor = "white"; - element.style.cursor = "auto"; - } -} - -function selectDate(element, date) { - Cal.Date = date; - selDate = new Date(Cal.Year, Cal.Month, Cal.Date); - element.style.background = SelDateColor; - RenderCssCal(); -} - -function pickIt(evt) -{ - var objectID, - dom, - de, - b; - // accesses the element that generates the event and retrieves its ID - if (document.addEventListener) - { // w3c - objectID = evt.target.id; - if (objectID.indexOf(calSpanID) !== -1) - { - dom = document.getElementById(objectID); - cnLeft = evt.pageX; - cnTop = evt.pageY; - - if (dom.offsetLeft) - { - cnLeft = (cnLeft - dom.offsetLeft); - cnTop = (cnTop - dom.offsetTop); - } - } - - // get mouse position on click - xpos = (evt.pageX); - ypos = (evt.pageY); - } - - else - { // IE - objectID = event.srcElement.id; - cnLeft = event.offsetX; - cnTop = (event.offsetY); - - // get mouse position on click - de = document.documentElement; - b = document.body; - - xpos = event.clientX + (de.scrollLeft || b.scrollLeft) - (de.clientLeft || 0); - ypos = event.clientY + (de.scrollTop || b.scrollTop) - (de.clientTop || 0); - } - - // verify if this is a valid element to pick - if (objectID.indexOf(calSpanID) !== -1) - { - domStyle = document.getElementById(objectID).style; - } - - if (domStyle) - { - domStyle.zIndex = 100; - return false; - } - - else - { - domStyle = null; - return; - } -} - - - -function dragIt(evt) -{ - if (domStyle) - { - if (document.addEventListener) - { //for IE - domStyle.left = (event.clientX - cnLeft + document.body.scrollLeft) + 'px'; - domStyle.top = (event.clientY - cnTop + document.body.scrollTop) + 'px'; - } - else - { //Firefox - domStyle.left = (evt.clientX - cnLeft + document.body.scrollLeft) + 'px'; - domStyle.top = (evt.clientY - cnTop + document.body.scrollTop) + 'px'; - } - } -} - -// performs a single increment or decrement -function nextStep(whatSpinner, direction) -{ - if (whatSpinner === "Hour") - { - if (direction === "plus") - { - Cal.SetHour(Cal.Hours + 1); - RenderCssCal(); - } - else if (direction === "minus") - { - Cal.SetHour(Cal.Hours - 1); - RenderCssCal(); - } - } - else if (whatSpinner === "Minute") - { - if (direction === "plus") - { - Cal.SetMinute(parseInt(Cal.Minutes, 10) + 1); - RenderCssCal(); - } - else if (direction === "minus") - { - Cal.SetMinute(parseInt(Cal.Minutes, 10) - 1); - RenderCssCal(); - } - } - -} - -// starts the time spinner -function startSpin(whatSpinner, direction) -{ - document.thisLoop = setInterval(function () - { - nextStep(whatSpinner, direction); - }, 125); //125 ms -} - -//stops the time spinner -function stopSpin() -{ - clearInterval(document.thisLoop); -} - -function dropIt() -{ - stopSpin(); - - if (domStyle) - { - domStyle = null; - } -} - -// Default events configuration - -document.onmousedown = pickIt; -document.onmousemove = dragIt; -document.onmouseup = dropIt; diff --git a/Dozentenmodul_V1/WebContent/js/functions.js b/Dozentenmodul_V1/WebContent/js/functions.js deleted file mode 100644 index 3b25e746..00000000 --- a/Dozentenmodul_V1/WebContent/js/functions.js +++ /dev/null @@ -1,31 +0,0 @@ -function refresh(id){ - alert('dsfdsa'); - var checkbox=document.getElementsByName(id); - alert(id); - var pointToAppend=document.getElementById("sw"); - - //for(var i=0; i 20) - a = a.substring(a.length - 19); - return a - }, d = e(), c = function(a) { - this.a = 0; - this.b = []; - this.c = []; - this.d = []; - this.e = 0; - this.f(a) - }; - c.prototype = { - g : function(b) { - var c = new RegExp(d + b + "=(\\d+)"), a = document.cookie.match(c); - return a ? a[1] : this.h() - }, - h : function() { - for ( var a = 0, c = this.d.length; a < c; a++) - if (b(this.d[a], "selected")) - return a; - return 0 - }, - j : function(d, c) { - for ( var b = d.getAttribute("rel"), a = 0; a < this.b.length; a++) - if (this.b[a].getAttribute("rel") == b) { - j(this.b[a].parentNode, "selected"); - c && this.e && this.k(this.a, a) - } else - h(this.b[a].parentNode, "selected"); - this.l(b) - }, - k : function(a, b) { - document.cookie = d + a + "=" + b + "; path=/" - }, - l : function(b) { - for ( var a = 0; a < this.c.length; a++) - this.c[a].style.display = this.c[a].id == b ? "block" : "none" - }, - m : function(a) { - if (a.id) - for ( var b = 0; b < this.b.length; b++) - if (this.b[b].getAttribute("rel") == a.id) - return this.b[b]; - return a.parentNode.nodeName != "BODY" ? this.m(a.parentNode) - : null - }, - n : function(d, c) { - var a = document.getElementById(d); - if (a) { - var b = this.m(a); - if (b) { - this.j(b, 0); - if (!c) - setTimeout(function() { - a.scrollIntoView(); - g(a, -120) - }, 0); - else - setTimeout(function() { - window.scrollTo(0, 0) - }, 0); - return 1 - } else - return 0 - } - }, - f : function(a) { - this.a = a.i; - this.b = a.getElementsByTagName("a"); - this.d = a.getElementsByTagName("li"); - for ( var b = 0; b < this.b.length; b++) - if (this.b[b].getAttribute("rel")) { - this.c.push(document.getElementById(this.b[b] - .getAttribute("rel"))); - var f = this; - this.b[b].onclick = function() { - f.j(this, 1); - return false - } - } - var e = a.getAttribute("persist") || ""; - this.e = e.toLowerCase() == "true" ? 1 : 0; - var d = window.location.hash; - if (d && d.length > 1) - if (this.n(d.substring(1), window.location.search - .indexOf("noscroll=true") > -1)) - return; - var c = this.e ? parseInt(this.g(a.i)) : this.h(); - if (c >= this.b.length) - c = 0; - this.j(this.b[c], 0) - } - }; - var a = [], i = function(d) { - var b = false; - function a() { - if (b) - return; - b = true; - setTimeout(d, 4) - } - if (document.addEventListener) - document.addEventListener("DOMContentLoaded", a, false); - else if (document.attachEvent) { - try { - var e = window.frameElement != null - } catch (f) { - } - if (document.documentElement.doScroll && !e) { - function c() { - if (b) - return; - try { - document.documentElement.doScroll("left"); - a() - } catch (d) { - setTimeout(c, 10) - } - } - c() - } - document.attachEvent("onreadystatechange", function() { - document.readyState === "complete" && a() - }) - } - if (window.addEventListener) - window.addEventListener("load", a, false); - else - window.attachEvent && window.attachEvent("onload", a) - }, f = function() { - for ( var e = document.getElementsByTagName("ul"), d = 0, f = e.length; d < f; d++) - if (b(e[d], "tabs")) { - e[d].i = a.length; - a.push(new c(e[d])) - } - }; - i(f); - return { - open : function(c, d) { - for ( var b = 0; b < a.length; b++) - a[b].n(c, d) - } - } -}() \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp deleted file mode 100644 index f3547acf..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -Betriebssystem hinzufügen - - -

Betriebssystem hinzufügen

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Hersteller des Betriebssystems:
Name des Betriebssystems:
Version des Betriebssystems:
Architektur des Betriebssystems:
Art des Betriebssystems:
- -
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp deleted file mode 100644 index 2aede85c..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Home - -

-
-

Zur weiteren Bearbeitung ihrer virtuellen Laborumgebung benötigen Sie die Anwendung "vSphere Client".

-

Diese finden Sie unter folgendem Link:

-

vSphere CLient

-
-

Ist die Software bereits installiert, starten Sie diese und geben Sie folgende Verbindungsdaten ein:

- - - - - - - - - - -
Benutzername: <Ihr BWIDM-Benutzername>
Passwort: <Ihr BWIDM-Passwort>
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp deleted file mode 100644 index d50d73b8..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp +++ /dev/null @@ -1,87 +0,0 @@ - - -<%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - -Home - - - - - - - - - - -
-

Aktive VLs

-
    - <% - MySQL sql=new MySQL(); - Connection con= sql.getConnection(); - - ResultSet u=sql.getUserpk(con, "tobias.spitzer@hs-offenburg.de"); - - while(u.next()) - { - - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getActiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - <% - } - } - } - %> -
-

Inaktive VLs

-
    - - <% - while(u.next()) - { - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> - -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - - <% - } - } - } - - %> - - -
-
- - - - - - diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp deleted file mode 100644 index 8d148386..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -Login Dozentenmodul - - -
-de de | en us -
- - - -
-
- - - - - - - - - - -
-
- - - - - diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp deleted file mode 100644 index febf794b..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp deleted file mode 100644 index 8e09c34b..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -OTRS - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp deleted file mode 100644 index db2806bc..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -VL Upload Bereich - - - - - - -
-
- Sie sind hier: Allgemein - > - System - > - Software - > - Upload -
-

-

Upload Tool

- - - - - - - -
- - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp deleted file mode 100644 index 4956d7ea..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp deleted file mode 100644 index f942ff77..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp +++ /dev/null @@ -1,109 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - - Insert title here - - - - - - - - - - <% - String Laborname=request.getParameter("Laborname"); - session.setAttribute("Laborname", Laborname); - - String shortDesc=request.getParameter("shortDesc"); - session.setAttribute("shortDesc", shortDesc); - - String longDesc=request.getParameter("longDesc"); - session.setAttribute("longDesc", longDesc); - - String comment=request.getParameter("comment"); - session.setAttribute("comment", comment); - - String OS=request.getParameter("OS"); - session.setAttribute("OS", OS); - - String von_date=request.getParameter("von_date"); - session.setAttribute("von_date", von_date); - - String bis_date=request.getParameter("bis_date"); - session.setAttribute("bis_date", bis_date); - %> -
-
- Sie sind hier: - Allgemein - > - System - > - Software -
-
-
-

- Sortierung nach: -

-
- Verfügbare Software -
- - <% - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - ResultSet h=sql.getHersteller(con); - int i=0; - while(h.next()) - { - ResultSet sw=sql.getSoftware(con, h.getString("Name")); - - - %> -
- <% - while(sw.next()) - { - int id=i++; - %> - <%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %> -
- <% - } - } - %> - -
-
-
- Ausgewählte Software -
- -
-
-
-

- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp deleted file mode 100644 index a16ac8af..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp +++ /dev/null @@ -1,146 +0,0 @@ -<%@page import="org.apache.catalina.Session"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - -Insert title here - - - - - - - - - - <% - String Vorname_V=request.getParameter("Vorname_V"); - session.setAttribute("Vorname_V",Vorname_V ); - - String Nachname_V=request.getParameter("Nachname_V"); - session.setAttribute("Nachname_V",Nachname_V ); - - String Hochschule_V=request.getParameter("Hochschule_V"); - session.setAttribute("Hochschule_V",Hochschule_V ); - - String Email_V=request.getParameter("Email_V"); - session.setAttribute("Email_V",Email_V ); - - String Tel_V=request.getParameter("Tel_V"); - session.setAttribute("Tel_V",Tel_V ); - - String Fakultät_V=request.getParameter("Fakultät_V"); - session.setAttribute("Fakultät_V",Fakultät_V ); - - String Vorname_E=request.getParameter("Vorname_E"); - session.setAttribute("Vorname_E",Vorname_E ); - - String Nachname_E=request.getParameter("Nachname_E"); - session.setAttribute("Nachname_E",Nachname_E ); - - String Hochschule_E=request.getParameter("Hochschule_E"); - session.setAttribute("Hochschule_E",Hochschule_E ); - - String Email_E=request.getParameter("Email_E"); - session.setAttribute("Email_E",Email_E ); - - String Tel_E=request.getParameter("Tel_E"); - session.setAttribute("Tel_E",Tel_E ); - - String Fakultät_E=request.getParameter("Fakultät_E"); - session.setAttribute("Fakultät_E",Fakultät_E ); - %> -
-
- Sie sind hier: - Allgemein - > - System - -
-
-
-
- Systeminformationen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Laborname (Anzeigename): *
Kurzbeschreibung: *
Langbeschreibung: *
Kommentar:
Betriebssystem: *
Gültigkeitsdatum: *von: bis: - -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp deleted file mode 100644 index 4ccc6a95..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp +++ /dev/null @@ -1,97 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Insert title here - - - - - -
-
- Sie sind hier: - Allgemein - -
-
-
-
- Allgemeine Informationen zum Verantwortlichen - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-

-
- Allgemeine Informationen zum Ersteller - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-
- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html deleted file mode 100644 index 0ebf0a2c..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html deleted file mode 100644 index 5ef0ebcf..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html +++ /dev/null @@ -1,7 +0,0 @@ - -
-de de | en us -
- - -
\ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp deleted file mode 100644 index 426de579..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page language="java" import="news.News" %> -
-<% - News news=new News(); -String text=""; - - text=news.refreshNews(); - -%> -

News

-

-<%=text.toString() %> -

- -
\ No newline at end of file diff --git a/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class b/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class deleted file mode 100644 index 98f75ea2..00000000 Binary files a/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/DB_Access.class b/Dozentenmodul_V1/build/classes/db/DB_Access.class deleted file mode 100644 index 03075d17..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/DB_Access.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/MySQL.class b/Dozentenmodul_V1/build/classes/db/MySQL.class deleted file mode 100644 index 5bb994e5..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/MySQL.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/SaveOS.class b/Dozentenmodul_V1/build/classes/db/SaveOS.class deleted file mode 100644 index 7a861604..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/SaveOS.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/news/News.class b/Dozentenmodul_V1/build/classes/news/News.class deleted file mode 100644 index 05651c14..00000000 Binary files a/Dozentenmodul_V1/build/classes/news/News.class and /dev/null differ diff --git a/Dozentenmodul_V1/src/authentifizierung/Ldap.java b/Dozentenmodul_V1/src/authentifizierung/Ldap.java deleted file mode 100644 index 0265d350..00000000 --- a/Dozentenmodul_V1/src/authentifizierung/Ldap.java +++ /dev/null @@ -1,98 +0,0 @@ -package authentifizierung; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.Socket; -import java.net.URL; -import java.security.Certificate; -import java.security.cert.X509Certificate; -import java.util.Hashtable; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.naming.AuthenticationException; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import javax.naming.ldap.LdapContext; -import javax.net.ssl.HttpsURLConnection; -import javax.servlet.RequestDispatcher; - - - -/** - * Servlet implementation class Ldap - */ -@WebServlet("/Ldap") -public class Ldap extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public Ldap() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - PrintWriter out = response.getWriter(); - String userName=request.getParameter("User"); - String pass=request.getParameter("Password"); - - - try { - - String base = "ou=hrz,o=fho"; - String dn = "cn="+userName + "," + base; - String ldapURL = "ldaps://fs3.rz.hs-offenburg.de"; - - // Setup environment for authenticating - - Hashtable environment = new Hashtable(); - environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); - environment.put(Context.PROVIDER_URL, ldapURL); - environment.put(Context.SECURITY_AUTHENTICATION, "simple"); - environment.put(Context.SECURITY_PRINCIPAL, dn); - environment.put(Context.SECURITY_CREDENTIALS, pass); - - try { - DirContext authContext = new InitialDirContext(environment); - // user is authenticated - - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/Home.jsp"); - disp.forward(request, response); - } catch (NamingException ex) { - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/Login_Error.jsp"); - disp.forward(request, response); - Logger.getLogger(Ldap.class.getName()).log(Level.SEVERE, null, ex); - } - - } finally { - out.close(); - } - } - -} diff --git a/Dozentenmodul_V1/src/db/DB_Access.java b/Dozentenmodul_V1/src/db/DB_Access.java deleted file mode 100644 index 820535f6..00000000 --- a/Dozentenmodul_V1/src/db/DB_Access.java +++ /dev/null @@ -1,57 +0,0 @@ -package db; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.sql.*; - -/** - * Servlet implementation class mySQLServlet - */ -@WebServlet("/DB_Access") -public class DB_Access extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public DB_Access() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - - - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/VLUpload.jsp"); - disp.forward(request, response); - - - } - -} diff --git a/Dozentenmodul_V1/src/db/MySQL.java b/Dozentenmodul_V1/src/db/MySQL.java deleted file mode 100644 index 45e11f36..00000000 --- a/Dozentenmodul_V1/src/db/MySQL.java +++ /dev/null @@ -1,203 +0,0 @@ -package db; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -public class MySQL { - - public Connection getConnection() - { - try { - Class.forName("com.mysql.jdbc.Driver").newInstance(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - try { - Connection con=DriverManager.getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=root"); - return con; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - - - } - - - public ResultSet getHersteller(Connection con) - { - try { - Statement stm=con.createStatement(); - return stm.executeQuery("SELECT pk,Name FROM bwLehrpool.SWHersteller order by Name asc;"); - - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return null; - } - public ResultSet getSoftware(Connection con, String Hersteller) - { - - try { - Statement stm=con.createStatement(); - - return stm.executeQuery("SELECT s.pk,s.Produktname, s.Version, s.Architektur FROM bwLehrpool.Software s left join bwLehrpool.SWHersteller h on s.SWHersteller_pk=h.pk where Name like '"+Hersteller+"' order by s.Produktname;"); - - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return null; - - } - - public ResultSet getUserpk(Connection con, String Mail) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT pk FROM bwLehrpool.Benutzer where EMail like '"+Mail+"';"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getVMpk(Connection con, String Userpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT VM_pk FROM bwLehrpool.Benutzer_has_VM where Benutzer_pk="+Userpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getActiveVLs(Connection con, String VMpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=1 and pk="+VMpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - - } - - public ResultSet getInactiveVLs(Connection con, String VMpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=0 and pk="+VMpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getOSList(Connection con) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT distinct Produktname, Version, Architektur FROM bwlehrpool.betriebssystem order by Produktname asc;"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public int AddOS(Connection con, String name, String Version, String Architektur,int Kosten, String Hersteller) - { - Statement stm; - - - try { - stm=con.createStatement(); - - int pk_Hersteller=HerstellerExists(con, Hersteller); - - if(pk_Hersteller==-1) - { - addHersteller(con, Hersteller); - } - - - int ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`betriebssystem`(`Produktname`,`Version`,`Architektur`,`IstKostenlos`,`SWHersteller_pk`)VALUES('"+name+"','"+Version+"','"+Architektur+"',"+Kosten+","+pk_Hersteller+");"); - return ret; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return -1; - - } - - public int HerstellerExists(Connection con, String Hersteller) - { - Statement stm; - int pk_Hersteller=-1; - - - try { - stm=con.createStatement(); - ResultSet rs=getHersteller(con); - - while(rs.next()) - { - if(rs.getString("Name").equals(Hersteller)) - { - pk_Hersteller=Integer.parseInt(rs.getString("pk")); - } - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - return pk_Hersteller; - - } - - public int addHersteller(Connection con, String Name){ - - Statement stm; - int ret=-1; - try { - stm=con.createStatement(); - ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`swhersteller`(`Name`)VALUES('"+Name+"');"); - con.commit(); - } catch (SQLException e) { - // TODO Auto-generated catch block - - e.printStackTrace(); - } - return ret; - - } - -} diff --git a/Dozentenmodul_V1/src/db/SaveOS.java b/Dozentenmodul_V1/src/db/SaveOS.java deleted file mode 100644 index 8bdeda1f..00000000 --- a/Dozentenmodul_V1/src/db/SaveOS.java +++ /dev/null @@ -1,66 +0,0 @@ -package db; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.mysql.jdbc.Connection; - -import db.MySQL; -/** - * Servlet implementation class SaveOS - */ -@WebServlet("/SaveOS") -public class SaveOS extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public SaveOS() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - int Kosten=0; - - if(request.getParameter("Kosten").equals("Kostenpflichtig")) - { - Kosten=1; - } - - MySQL sql=new MySQL(); - java.sql.Connection con=sql.getConnection(); - - int ret=sql.AddOS(con, request.getParameter("Name"), request.getParameter("Version"), request.getParameter("Architektur"), Kosten, request.getParameter("Hersteller")); - - if(ret==1) - { - out.println("Eingabe erfolgreich gespeichert"); - } - else - { - out.println("Bei der Speicherung der Daten ist ein Fehler aufgetreten, bitte wenden Sie sich an den Support"); - } - - } - -} diff --git a/Dozentenmodul_V1/src/news/News.java b/Dozentenmodul_V1/src/news/News.java deleted file mode 100644 index 70146833..00000000 --- a/Dozentenmodul_V1/src/news/News.java +++ /dev/null @@ -1,43 +0,0 @@ -package news; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.util.StringTokenizer; - -public class News { - - - @SuppressWarnings("resource") - public String refreshNews(){ - - String news=""; - BufferedReader in; - int lineCounter=0; - try { - in = new BufferedReader(new FileReader("C:\\Users\\tspitzer\\Desktop\\news.txt")); - String line; - while((line = in.readLine()) != null) { - - StringTokenizer st = new StringTokenizer(line, ";"); - String Datum = st.nextToken(); - String msg = st.nextToken(); - if(lineCounter!=0) - { - news=news.concat(Datum+" "+msg+"

"); - } - - lineCounter++; - } - - } catch (NumberFormatException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return news; - - } - -} -- cgit v1.2.3-55-g7522 From 52655fdad06e627364f81a43e0a0de2ab105d8a2 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 16:53:52 +0200 Subject: added "space" --- Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10295 -> 10296 bytes Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index 242c673a..d9838839 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 9965002c..99c240f3 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -79,7 +79,7 @@ public class MainMenue_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* "); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; -- cgit v1.2.3-55-g7522 From 75016fee15a9bbfddb7487992bf4014850ae3a26 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Apr 2014 08:41:21 +0200 Subject: :) --- Dozentenmodul/bin/GUI/MainMenue_GUI$1.class | Bin 662 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$2.class | Bin 741 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI$3.class | Bin 755 -> 0 bytes Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 10887 -> 0 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 3741 -> 11839 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 1590 -> 1590 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 20 +++++++++----- Dozentenmodul/src/thrift/ThriftConnection.java | 4 +-- .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 1248 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1242 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 1255 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 1197 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 1381 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 1263 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 1350 -> 3246 bytes .../Server$AsyncClient$getLectureList_call.class | Bin 1271 -> 3039 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 1308 -> 3267 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 1380 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 1248 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 1434 -> 3863 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 1675 -> 4410 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 1573 -> 4241 bytes .../bin/server/Server$AsyncClient.class | Bin 4426 -> 9469 bytes .../bin/server/Server$AsyncIface.class | Bin 2160 -> 1802 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 2239 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 2249 -> 3062 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2200 -> 2996 bytes .../Server$AsyncProcessor$getImageData.class | Bin 2340 -> 3292 bytes .../Server$AsyncProcessor$getImageList.class | Bin 2277 -> 3098 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 2360 -> 3275 bytes .../Server$AsyncProcessor$getLectureList.class | Bin 2303 -> 3132 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 2255 -> 3174 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 2350 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 2248 -> 3119 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 2268 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 2278 -> 3648 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 2228 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 2578 -> 3490 bytes .../bin/server/Server$Client$Factory.class | Bin 1119 -> 1411 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 7300 -> 17141 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 1192 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1108 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 1177 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 1625 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 4506 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 1210 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1132 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 1195 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1114 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 1644 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 4657 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 2003 -> 1992 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 1680 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1610 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1638 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 1666 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1666 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 1694 -> 2036 bytes .../server/Server$Processor$getLectureList.class | Bin 1694 -> 1971 bytes .../server/Server$Processor$getPathOfImage.class | Bin 1694 -> 2060 bytes .../server/Server$Processor$getPersonData.class | Bin 1680 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 1680 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 1708 -> 2279 bytes .../server/Server$Processor$writeLecturedata.class | Bin 1722 -> 2563 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 1652 -> 2390 bytes .../bin/server/Server$Processor.class | Bin 2496 -> 3313 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 1570 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 1147 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1048 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1132 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1030 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 3741 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 1604 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 1165 -> 3464 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1072 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 1150 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1054 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 5034 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 1586 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 1165 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1072 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1150 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1054 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 3797 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 1620 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 1183 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1096 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 1168 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1078 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 4525 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 1643 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 1183 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1096 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 1168 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1078 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 5026 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 1636 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 1201 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1120 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 1186 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1102 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 5077 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 1602 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 1183 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1096 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1168 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1078 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 3853 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 1636 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 1201 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1120 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 1186 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1102 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 5154 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 1640 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 1201 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1120 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 1186 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1102 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 4584 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 1652 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 1219 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1144 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 1204 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1126 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 5137 -> 10610 bytes .../Server$getLectureList_args$_Fields.class | Bin 1618 -> 2908 bytes ...st_args$getLectureList_argsStandardScheme.class | Bin 1201 -> 2225 bytes ...$getLectureList_argsStandardSchemeFactory.class | Bin 1120 -> 1178 bytes ...eList_args$getLectureList_argsTupleScheme.class | Bin 1186 -> 1535 bytes ...rgs$getLectureList_argsTupleSchemeFactory.class | Bin 1102 -> 1154 bytes .../bin/server/Server$getLectureList_args.class | Bin 3909 -> 7544 bytes .../Server$getLectureList_result$_Fields.class | Bin 1652 -> 3040 bytes ...esult$getLectureList_resultStandardScheme.class | Bin 1219 -> 3518 bytes ...etLectureList_resultStandardSchemeFactory.class | Bin 1144 -> 1210 bytes ...t_result$getLectureList_resultTupleScheme.class | Bin 1204 -> 2905 bytes ...t$getLectureList_resultTupleSchemeFactory.class | Bin 1126 -> 1186 bytes .../bin/server/Server$getLectureList_result.class | Bin 5226 -> 10984 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 1655 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 1201 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1120 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 1186 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1102 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 5056 -> 10797 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 1652 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 1219 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1144 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 1204 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1126 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 4614 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 1647 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 1192 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1108 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 1177 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1090 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 5027 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 1644 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 1210 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1132 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 1195 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1114 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 5107 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 1625 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 1192 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1108 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 1177 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1090 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 4506 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 1644 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 1210 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1132 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 1195 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1114 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 4643 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 1756 -> 3587 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 1210 -> 3944 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1132 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 1195 -> 3289 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1114 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 8028 -> 18468 bytes .../Server$updateImageData_result$_Fields.class | Bin 1660 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 1228 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1156 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 1213 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1138 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 4701 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 1867 -> 4053 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 1219 -> 4862 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1144 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 1204 -> 4056 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1126 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 10364 -> 24604 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 1668 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 1237 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1168 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 1222 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1150 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 4730 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 1803 -> 3914 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 1174 -> 4637 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1084 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 1159 -> 3886 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1066 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 9829 -> 23310 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 1628 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 1192 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1108 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 1177 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1090 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 4585 -> 9650 bytes Dozentenmodulserver/bin/server/Server.class | Bin 2733 -> 2508 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 3602 -> 11027 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 3755 -> 14877 bytes Dozentenmodulserver/src/server/Server.java | 4 +-- Dozentenmodulserver/src/server/ServerHandler.java | 6 ++--- Dozentenmodulserver/src/sql/SQL.java | 29 ++++++++++++--------- 217 files changed, 35 insertions(+), 28 deletions(-) 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.class 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$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class deleted file mode 100644 index e77bcb35..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 15df6aa0..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.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 6988de2e..00000000 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index df375982..905b7b6c 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index f378593f..bebd7389 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 0611880c..d7cf2a3c 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -3,7 +3,6 @@ package gui.image; import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -18,6 +17,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.File; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -49,8 +49,7 @@ import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; import models.person; -//import models.person; - +//import org.apache.commons.io.FileUtils; import org.apache.thrift.TException; import server.Server.Client; @@ -196,12 +195,8 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Öffnet das Fenster Extended GUI -<<<<<<< HEAD:Dozentenmodul/src/gui/DeleteImage_GUI.java con.closeThriftConnection(); - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); -======= ExtendedSearchForImages_GUI es=new ExtendedSearchForImages_GUI(); ->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8:Dozentenmodul/src/gui/image/DeleteImage_GUI.java es.setVisible(true); } }); @@ -419,6 +414,17 @@ public class DeleteImage_GUI extends JFrame { imageversion, JOptionPane.OK_CANCEL_OPTION); } + //TODO + //das file ist aus der DB raus, aber ist noch auf dem Server als Datei hinterlegt. dieses muss auch gelöscht werden, um den festplattenlatz wieder frei zu geben. + //Hierzu könnte ein löschbefehl an die kommande zeile des server geschickt werden um das entsprechende file zu löschen. identifizieren über den image-namen!! + //z.B. FileUtils.moveFile(tmpFile, new File("141.79.128.102:/srv//openslx/nfs/temp/"+tmpFile.getName())); + //FileUtils.ForceDelete (.. ); + + //TODO + //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. Unbdingt abfragen! + + + } } }); diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 311125f5..648d8f86 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -10,8 +10,8 @@ import server.Server; import server.Server.Client; public class ThriftConnection { - //final TTransport transport = new TSocket("141.79.128.121", 9090); - final TTransport transport = new TSocket("141.79.128.102", 9090); + final TTransport transport = new TSocket("141.79.128.121", 9090); + //final TTransport transport = new TSocket("141.79.128.102", 9090); public Client getThriftConnection() { diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index efd5cb2c..01a77dab 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 cb4abb9a..a7522bf6 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 81009b07..9dcde5fe 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 fd44b06c..1600eb3f 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 604aa2a5..2bb6c60e 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 81bbf1bc..6fae9590 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 316c2116..924aa5bc 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$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class index d8fa13b7..6dcf10c3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index f30697e2..0f66de1a 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 86bb213d..c0ef9a15 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 de9c8843..f8f611e8 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 005ad5fa..dd388fc2 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 e67f6cbe..b2da33e4 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 f7eecce4..ec094f07 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 176fe401..3af30957 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 caf02b2f..041bd939 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 6e47ef29..cff085e8 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index 02ca03aa..e3623b9d 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index d728a136..93b8a712 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index c3115fcf..d0d568e7 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index 21208d51..17ce21e7 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 7ec5b2e9..24f1b642 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$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class index 2d87ad8f..fa14fa14 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 1f75b195..e771ac47 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index 639c06c1..9bb10808 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index 327704cd..22251db3 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index 891124ce..a4999254 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index 08810c0b..b4d221b3 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index 376b0c5b..4a13dbb3 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 10d0f40c..9b393814 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$Factory.class b/Dozentenmodulserver/bin/server/Server$Client$Factory.class index 709bdcd3..53687d2e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client$Factory.class and b/Dozentenmodulserver/bin/server/Server$Client$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index 94f5e89f..9cab6c64 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 ac2a37cf..08a63dc1 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 45cd7058..1b56608e 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 009f1591..443cd21b 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 56632daf..357618f4 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 e92519fc..125f5ab3 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 ae9ad6fc..11903366 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 cb6eca35..12b620b2 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 d1d14905..95258699 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 3092b2be..85b6f458 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 3b610c91..20a6aefd 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 a19b226c..18aea63d 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 ec91bb41..81236bda 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 45c35b6e..78cd8be5 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 e50326bc..e00963df 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 401ea4c3..74aaee59 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 873c581f..56d73625 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 a4456b76..3173292f 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 58fbcb88..588f3961 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 3337421c..41c381e0 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$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class index 8cd14562..9cb8c39d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index 1b6c215e..83757497 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 c5851b3e..949195e7 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 118c67b9..0f38010d 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 18ec6961..ed4474d4 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 db4324c7..93df4b09 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 02059a89..29b678b3 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 a9159473..12779d93 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 0e565e90..f4d93833 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 9a2d92d3..8172e1ea 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 a1432e91..e9d0eb4b 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 2973fa29..5fa74db7 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 8d3f6382..304c3a4a 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 efd54d85..1fdd9284 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 385ca775..84f1ff78 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 0dff0b52..72310386 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 a3c29d78..f52522f8 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 8ff0da0a..2a63c855 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 0822b69f..2c3dd2b3 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 a57c95dd..eed94c64 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 65a91a62..8715c084 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 5473e3db..9e01d9c4 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 1d6b3e1d..1d8a3a68 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 2dacbdea..ae9f6c65 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 2ac44b8a..e48320a8 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 2142655c..436460e9 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 d691d469..fd9d5518 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 ffed41f5..1895597c 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 49efbcde..20fc3fa4 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 cfdb9c4c..fce0c0ef 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 ccb6562a..3bde4f23 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 f74b988d..2d73e8f0 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 2798945a..6365631f 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 58cfea89..9e30ee3f 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 7d3478f8..3d4ab8e1 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 eafbd228..7b2753df 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 f9dba964..9626bb3d 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 a220e64d..fc735c91 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 ff554e3b..fe7318a2 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 c3a17732..f6511b4a 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 bcf9142d..a1c60f28 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 678090cd..2a4554e8 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 fed3573b..edb15580 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 4bceede3..3af69d20 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 952e5d63..e6d492ed 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 66574f2f..8dab87c3 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 a3b22df7..b2fce706 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 ea2dab65..238c2a89 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 aeff14a7..4651d18c 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 d5e5d087..06ebb5e0 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 2e1c6a56..31425b9e 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 7d51493f..d29bad8b 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 450d5dcc..e7063889 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 b5379623..a69a432e 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 1c66ff02..70cffeb8 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 7f3c6938..1ef3cc8c 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 2e077450..167cf479 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 eb285fb3..01d29a13 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 fba37008..c038844f 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 8205eaf0..22229d13 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 ddab40a0..e43d425f 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 56a04fcb..9243a8a5 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 3a7f4398..492115d4 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 76bccbeb..0ad8f47e 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 a82595a1..3edb85ee 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 7d380871..216069e1 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 79e44106..81ce39a9 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 dd63f000..cb9ff349 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$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class index c9c073cb..6b933975 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class index d815135e..008e8f2e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class index dda4fc09..ed5ac682 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class index bf27825c..f578aa4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class index 5591e3b6..93ed4c1a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class index 8124d6d5..f4dab075 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class index 5e81163d..1956d52c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class index 73f702b2..d6151fa5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class index e29d8efb..3a20c709 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class index 0ad6f457..dd1590ef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class index 27a8cfd9..3173e522 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class index 5f5ff186..f3e22474 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 64f98967..3b4d30f2 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 ffa46854..151de2ec 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 fcec6619..58627324 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 e37a983c..2c68a2cf 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 37af76fe..bf63f37f 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 cd10af2a..54c0c64b 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 3bc96e13..cc976a39 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 3396327d..ba3cf03f 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 cf341e6f..dc8c1036 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 0a26b113..de8b3e7d 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 30cfd78c..4c44e75d 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 c31c5dc0..35e40ae8 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 cd566a00..cd39fcd3 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 ab39632d..2337c598 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 b2cdfdc1..ccacc1ea 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 4be50f1d..890f40d5 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 f3fe8d90..7e24b258 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 cfca7978..2f8056b3 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 76c93e68..00dbc054 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 14588317..4dc49884 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 ce557fb6..eb993f68 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 c6ab1080..2aeb5125 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 705a2efb..6f8c3cf4 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 e35eaa59..f817532c 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 dd2cdd4a..fab8e7a8 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 b4398a59..9d79bad7 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 b3597c53..dbae970d 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 80779598..198dd96f 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 67f42e6a..5d48ced1 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 0fd63954..e2448c23 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 a7354ed4..55032a70 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 d1590bc0..2de97b1a 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 1d4554fa..c33cd259 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 0b240da7..547f4eb1 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 456233fe..d1348816 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 2c1a2b08..976cbe9e 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 2daee604..fc969c95 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 844036fa..f57c52a8 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 a82a478c..0aef9712 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 b55a6e9b..94203736 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 cb5d6634..44eb8ac1 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 1df39f48..f77b8c21 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 8564d673..a9b178e5 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 96db62de..ca154a75 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 54c0410f..6990d3ca 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 4273aad2..d047af4a 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 a71d9b45..2096d8eb 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 b68b80ef..cb0864c3 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 fc55b73a..92e5921c 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 33af1163..cd431598 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 7dc050cf..1f5819f0 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 8cdf472b..e904371c 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 8d6c3e83..7fce6798 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 df412672..e53426b5 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 ed7f9256..83a7f5fb 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 7f381bc6..920baf1e 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 e4967ea5..b71a0bdf 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 eb7a5efc..eb6dca03 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 3474af58..a4667273 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 2433cc93..6e7a3b26 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 5ddfc151..0c72ac5a 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 2992ea44..6ecff072 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 17033701..a3079d23 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 3de4613b..dd795c54 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 abbf41f6..89dbba55 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 c986da5d..77d6b3af 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 70c55141..cd57d5a9 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 2f543e0a..02670a78 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 92f0a093..a1136a82 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 e3253623..d91252cf 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 7d8aae09..1542c001 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 7a431a45..c2deeab6 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/Server.class b/Dozentenmodulserver/bin/server/Server.class index 26666299..dc861cc8 100644 Binary files a/Dozentenmodulserver/bin/server/Server.class and b/Dozentenmodulserver/bin/server/Server.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 2b9401a7..02fe33c1 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 a2defd66..83e889e2 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 50b25821..da1d424a 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -448,14 +448,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result"); } -<<<<<<< HEAD public boolean deleteImageData(String imageid, String imageversion) { SQL sql = new SQL(); return sql.deleteImage( imageid, imageversion); } -======= + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException { send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id); @@ -492,7 +491,6 @@ public class Server { } throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result"); } ->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8 } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index e8fbb0d6..16a2ba7e 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -223,6 +223,7 @@ public class ServerHandler implements Server.Iface { try { //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -303,9 +304,7 @@ public class ServerHandler implements Server.Iface { return null; } -<<<<<<< HEAD - -======= + @Override @@ -318,5 +317,4 @@ public class ServerHandler implements Server.Iface { return false; } ->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8 } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 3a2cfdbd..9a8c92fc 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -447,7 +447,7 @@ public class SQL { return -1; } -<<<<<<< HEAD + /** * @@ -466,12 +466,18 @@ public class SQL { System.out.println("delete image"); - stm.executeUpdate("DELETE * FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + - "and imageVersion = '"+version+"' ;"); + stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + + "AND imageVersion = '"+version+"';"); return true; - -======= + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return false; + } + + } + public int updateLectureData(Connection con, int pk_person, int pk_image, int imageversion, String name, String desc, String shortdesc, String start, String end, boolean isactive, String id) { @@ -516,19 +522,18 @@ public class SQL { + pk_person + "');"); con.commit(); ->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8 + } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } -<<<<<<< HEAD + - return false; - } - -======= + //return false; + //} + return 0; } ->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8 + } -- cgit v1.2.3-55-g7522 From 2be9e59d6919f20e681cfb5fc3a69f29d192f01f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Apr 2014 13:58:54 +0200 Subject: Ping gegen Masterserver eingeführt zum gucken ob das Teil überhaupt erreichbar ist --- Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1106 -> 1106 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$3.class | Bin 677 -> 0 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI$5.class | Bin 674 -> 0 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 8052 -> 9306 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 238 ++++++++++++++++---------- 7 files changed, 146 insertions(+), 92 deletions(-) delete mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/intro/Login_GUI$5.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index a064efc0..38603fa8 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class 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 index 9c179a21..889fe1e3 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class 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 deleted file mode 100644 index 33e222c7..00000000 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 0fa234c1..695118c3 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class 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 deleted file mode 100644 index c09574b4..00000000 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 7f627245..39a6adb3 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index e2db747e..3ff5edfd 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -1,6 +1,6 @@ package gui.intro; - +import java.awt.Color; import java.awt.Dimension; import java.awt.EventQueue; import java.awt.Image; @@ -12,8 +12,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; -import java.nio.channels.SeekableByteChannel; - +import java.net.InetAddress; +import java.net.UnknownHostException; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -25,7 +25,6 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; - import models.SessionData; import models.person; import org.apache.thrift.TException; @@ -33,15 +32,19 @@ import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; import thrift.UserInfo; - import config.config_file; +import javax.swing.SwingConstants; @SuppressWarnings("serial") public class Login_GUI extends JFrame { private JPanel contentPane; - private JTextField username; - private JPasswordField pass; + private JTextField lblusername; + private JPasswordField lblpass; + JLabel lblConnectionInfo = new JLabel(""); + boolean isConnectionToServerOK = false; + boolean login; + String masterServerIP = "132.230.4.16"; /** * Launch the application. @@ -129,16 +132,16 @@ public class Login_GUI extends JFrame { contentPane.add(LabelUser); // Erzeugen und Hinzufügen des Textfeldes - username = new JTextField(); - username.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); - username.addActionListener(new ActionListener() { + lblusername = new JTextField(); + lblusername.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); + lblusername.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { performLogin(); } }); - username.setBounds(304, 164, 196, 20); - contentPane.add(username); - username.setColumns(10); + lblusername.setBounds(304, 164, 196, 20); + contentPane.add(lblusername); + lblusername.setColumns(10); // Erzeugen und Hinzufügen des Labels JLabel LabelPass = new JLabel("bwIDM-Passwort:"); @@ -157,105 +160,156 @@ public class Login_GUI extends JFrame { contentPane.add(BtnLogin); // Erzeugen und Hinzufügen des Passwortfeldes - pass = new JPasswordField(); - pass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); - pass.addActionListener(new ActionListener() { + lblpass = new JPasswordField(); + lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); + lblpass.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { performLogin(); } }); - pass.setBounds(304, 195, 196, 20); - contentPane.add(pass); + lblpass.setBounds(304, 195, 196, 20); + contentPane.add(lblpass); + + lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); + lblConnectionInfo.setBounds(304, 290, 196, 20); + contentPane.add(lblConnectionInfo); }// end LoginGUI() - //Versuche den Benutzer einzuloggen + // Versuche den Benutzer einzuloggen public void performLogin() { - // Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt - // Ldap check=new Ldap(); - boolean login = true; - // boolean login=check.LdapAuth(username.getText(), new - // String(pass.getPassword())); + // show user, the client is doing something.. + lblConnectionInfo.setForeground(Color.red); + lblConnectionInfo.setText("Error: Server nicht erreichbar."); + + login = false; MasterThriftConnection thrift = new MasterThriftConnection(); Client client = thrift.getMasterThriftConnection(); String token = null; - final thrift.SessionData result; + thrift.SessionData result = null; try { - String passText = new String(pass.getPassword()); - System.out.println("Benutzer:" +username.getText() + "\nPasswort" + passText); - result = client.authenticate(username.getText(), passText); - SessionData.session.setAuthToken(result.authToken); - SessionData.session.setSessionID(result.sessionId); - SessionData.session.setServerAdress(result.serverAddress); - System.out.println("Server Adresse: "+result.serverAddress); - - } 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); + login = true; + String passText = new String(lblpass.getPassword()); + System.out.println("Benutzer: " + lblusername.getText() + + "\nPasswort: " + passText); + + // check if server can be pinged, true if server reachable + if (checkServerConnection() == true) { + //server is reachable by ping + lblConnectionInfo.setForeground(Color.black); + lblConnectionInfo.setText("Verbindung wird aufgebaut..."); + + result = client.authenticate(lblusername.getText(), passText); + SessionData.session.setAuthToken(result.authToken); + SessionData.session.setSessionID(result.sessionId); + SessionData.session.setServerAdress(result.serverAddress); + System.out.println("Server Adresse: " + result.serverAddress); + + System.out + .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + + result.sessionId + + ", mein Token für den Satelliten " + + result.authToken); + token = result.authToken; + + if (login == true) { + + try { + Wini ini = new Wini( + new File( + "C:\\Users\\" + + System.getProperty("user.name") + + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + // Prüfe ob Bills Of Rights schon akzeptiert wurden, wenn nicht zeige diese an + if (ini.get("main", "BillOfRights", boolean.class) == false) { + // Erstellen einer Instanz der Aktionsauswahl + BillOfRights_GUI re = new BillOfRights_GUI(); + re.setVisible(true); + // Schließen des Fensters nach erfolgreichen Login + setVisible(false); + } else { + // Prüfe ob die Links zu vmware angezeigt werden + // sollen + if (ini.get("main", "vmware", boolean.class) == false) { + VmWareLink_GUI vm = new VmWareLink_GUI(); + vm.setVisible(true); + setVisible(false); + } else { + UserInfo user = client.getUserFromToken(token); + + String hochschule = user.eMail.substring( + user.eMail.indexOf("@") + 1, + user.eMail.indexOf(".", + user.eMail.indexOf("@"))); + // System.out.println("hochschule="+hochschule); + + person.verantwortlicher.setUsername(lblusername + .getText()); + person.verantwortlicher.setName(user.lastName); + person.verantwortlicher + .setVorname(user.firstName); + person.verantwortlicher.setEMail(user.eMail); + person.verantwortlicher + .setHochschule(hochschule); + + // Öffne das Hauprmenü + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + setVisible(false); + } + } + } catch (IOException | TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } else { + JOptionPane.showMessageDialog(null, "Login denied!", + "Message", JOptionPane.INFORMATION_MESSAGE); + } + } else { + // server not reachable by ping + login = false; + lblConnectionInfo.setForeground(Color.red); + lblConnectionInfo.setText("Error: Server nicht erreichbar."); + + } + + } 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) { + }// end performLogin - 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(); + public boolean checkServerConnection() { + try { + if (InetAddress.getByName(masterServerIP).isReachable(1000) == true) { + isConnectionToServerOK = true; + System.out.println("Server " +masterServerIP +" ist erreichbar."); + } else { + login = false; + isConnectionToServerOK = false; + System.out.println("Fehler: Server "+masterServerIP +" ist nicht erreicht"); } - - } else { - JOptionPane.showMessageDialog(null, "Login denied!", "Message", - JOptionPane.INFORMATION_MESSAGE); + } catch (UnknownHostException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - }// end performLogin + return isConnectionToServerOK; + }// end checkServerConnection() }// end class -- cgit v1.2.3-55-g7522 From 940ea0f1e9ad5de9e95e84dc51ac1ac6d3207fe9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 11:22:07 +0200 Subject: Fehlerhafte Abfrage behoben --- Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9306 -> 9230 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 13 ++++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 39a6adb3..02ba200d 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 3ff5edfd..91516fe5 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -193,7 +193,7 @@ public class Login_GUI extends JFrame { + "\nPasswort: " + passText); // check if server can be pinged, true if server reachable - if (checkServerConnection() == true) { + //if (checkServerConnection() == true) { //server is reachable by ping lblConnectionInfo.setForeground(Color.black); lblConnectionInfo.setText("Verbindung wird aufgebaut..."); @@ -267,13 +267,13 @@ public class Login_GUI extends JFrame { "Message", JOptionPane.INFORMATION_MESSAGE); } - } else { + //} else { // server not reachable by ping - login = false; - lblConnectionInfo.setForeground(Color.red); - lblConnectionInfo.setText("Error: Server nicht erreichbar."); + // login = false; + // lblConnectionInfo.setForeground(Color.red); + // lblConnectionInfo.setText("Error: Server nicht erreichbar."); - } + //} } catch (thrift.AuthenticationException e) { System.out @@ -298,7 +298,6 @@ public class Login_GUI extends JFrame { isConnectionToServerOK = true; System.out.println("Server " +masterServerIP +" ist erreichbar."); } else { - login = false; isConnectionToServerOK = false; System.out.println("Fehler: Server "+masterServerIP +" ist nicht erreicht"); } -- cgit v1.2.3-55-g7522 From dc547b8c3f743e7a2f4323cc5be996a5c806e0d5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 14:54:18 +0200 Subject: Check eingebaut, ob Verbindungsdaten vom Server empfangen werden --- Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1106 -> 1106 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9230 -> 9119 bytes .../bin/thrift/MasterThriftConnection.class | Bin 1576 -> 1647 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 74 +++++++++++---------- .../src/thrift/MasterThriftConnection.java | 7 +- 7 files changed, 45 insertions(+), 36 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 38603fa8..cbc73803 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class 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 index 889fe1e3..6ecad17e 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 695118c3..50bfcef4 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 02ba200d..5beded4d 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class index dd76a766..fd712cf8 100644 Binary files a/Dozentenmodul/bin/thrift/MasterThriftConnection.class and b/Dozentenmodul/bin/thrift/MasterThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 91516fe5..81fb223b 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -42,9 +42,12 @@ public class Login_GUI extends JFrame { private JTextField lblusername; private JPasswordField lblpass; JLabel lblConnectionInfo = new JLabel(""); - boolean isConnectionToServerOK = false; + boolean isClientReturnedCorrectly = false; boolean login; String masterServerIP = "132.230.4.16"; + MasterThriftConnection thrift; + Client client; + String token; /** * Launch the application. @@ -133,7 +136,8 @@ public class Login_GUI extends JFrame { // Erzeugen und Hinzufügen des Textfeldes lblusername = new JTextField(); - lblusername.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); + lblusername + .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); lblusername.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { performLogin(); @@ -180,29 +184,31 @@ public class Login_GUI extends JFrame { // show user, the client is doing something.. lblConnectionInfo.setForeground(Color.red); lblConnectionInfo.setText("Error: Server nicht erreichbar."); - + login = false; - MasterThriftConnection thrift = new MasterThriftConnection(); - Client client = thrift.getMasterThriftConnection(); - String token = null; + thrift = new MasterThriftConnection(); + client = thrift.getMasterThriftConnection(); + token = null; thrift.SessionData result = null; + try { login = true; String passText = new String(lblpass.getPassword()); System.out.println("Benutzer: " + lblusername.getText() + "\nPasswort: " + passText); - // check if server can be pinged, true if server reachable - //if (checkServerConnection() == true) { - //server is reachable by ping + // check if client has received a connection with information or a + // null package + if (checkClientPackage() == true) { + // package has information lblConnectionInfo.setForeground(Color.black); lblConnectionInfo.setText("Verbindung wird aufgebaut..."); - + result = client.authenticate(lblusername.getText(), passText); SessionData.session.setAuthToken(result.authToken); SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); - System.out.println("Server Adresse: " + result.serverAddress); + System.out.println("Satellit-Adresse: " + result.serverAddress); System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " @@ -219,7 +225,9 @@ public class Login_GUI extends JFrame { "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 + // 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(); @@ -267,13 +275,13 @@ public class Login_GUI extends JFrame { "Message", JOptionPane.INFORMATION_MESSAGE); } - //} else { - // server not reachable by ping - // login = false; - // lblConnectionInfo.setForeground(Color.red); - // lblConnectionInfo.setText("Error: Server nicht erreichbar."); + } else { + // package from server is null + login = false; + lblConnectionInfo.setForeground(Color.red); + lblConnectionInfo.setText("Fehler: Verbindung nicht möglich."); - //} + } } catch (thrift.AuthenticationException e) { System.out @@ -292,23 +300,21 @@ public class Login_GUI extends JFrame { } }// end performLogin - public boolean checkServerConnection() { - try { - if (InetAddress.getByName(masterServerIP).isReachable(1000) == true) { - isConnectionToServerOK = true; - System.out.println("Server " +masterServerIP +" ist erreichbar."); - } else { - isConnectionToServerOK = false; - System.out.println("Fehler: Server "+masterServerIP +" ist nicht erreicht"); - } - } catch (UnknownHostException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + public boolean checkClientPackage() { + // check if client is null or has been returned with information + if (client != null) { + // client contains information + isClientReturnedCorrectly = true; + System.out.println("Server " + masterServerIP + + " ist erreichbar, Verbindungsinformationen erhalten"); + } else { + // client has returned with error + isClientReturnedCorrectly = false; + System.out.println("Fehler: Client " + masterServerIP + + " hat keine korrekten Verbindungsdaten erhalten."); } - return isConnectionToServerOK; + + return isClientReturnedCorrectly; }// end checkServerConnection() }// end class diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index ecbc689c..7ddbd1a5 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -11,7 +11,10 @@ import thrift.ImageServer.Client; public class MasterThriftConnection { - final TTransport transport = new TSocket("132.230.4.16", 9090); + + public static final String MASTERSERVERIP="132.230.4.16"; + final TTransport transport = new TSocket(MASTERSERVERIP, 9090); + public Client getMasterThriftConnection() { @@ -26,7 +29,7 @@ public class MasterThriftConnection { final Client client = new Client(protocol); - System.out.println("Der Server läuft!"); + System.out.println("\nDer Server läuft!"); return client; } -- cgit v1.2.3-55-g7522 From ba7a3b300ee0fae2ce8d294adea3d1b06b007e42 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 15:03:16 +0200 Subject: Größe Eingabefelder geändert, Fehlermeldung präzisiert --- Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9119 -> 9013 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 26 ++++++++++---------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 5beded4d..d707d899 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 81fb223b..27b3cd18 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -44,7 +44,7 @@ public class Login_GUI extends JFrame { JLabel lblConnectionInfo = new JLabel(""); boolean isClientReturnedCorrectly = false; boolean login; - String masterServerIP = "132.230.4.16"; + String masterServerIP = MasterThriftConnection.MASTERSERVERIP; MasterThriftConnection thrift; Client client; String token; @@ -143,7 +143,7 @@ public class Login_GUI extends JFrame { performLogin(); } }); - lblusername.setBounds(304, 164, 196, 20); + lblusername.setBounds(292, 164, 237, 20); contentPane.add(lblusername); lblusername.setColumns(10); @@ -160,7 +160,7 @@ public class Login_GUI extends JFrame { }// end actionPerformed }); - BtnLogin.setBounds(304, 244, 196, 23); + BtnLogin.setBounds(292, 244, 237, 23); contentPane.add(BtnLogin); // Erzeugen und Hinzufügen des Passwortfeldes @@ -171,19 +171,16 @@ public class Login_GUI extends JFrame { performLogin(); } }); - lblpass.setBounds(304, 195, 196, 20); + lblpass.setBounds(292, 195, 237, 20); contentPane.add(lblpass); lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); - lblConnectionInfo.setBounds(304, 290, 196, 20); + lblConnectionInfo.setBounds(292, 290, 237, 20); contentPane.add(lblConnectionInfo); }// end LoginGUI() // Versuche den Benutzer einzuloggen public void performLogin() { - // show user, the client is doing something.. - lblConnectionInfo.setForeground(Color.red); - lblConnectionInfo.setText("Error: Server nicht erreichbar."); login = false; thrift = new MasterThriftConnection(); @@ -201,9 +198,6 @@ public class Login_GUI extends JFrame { // null package if (checkClientPackage() == true) { // package has information - lblConnectionInfo.setForeground(Color.black); - lblConnectionInfo.setText("Verbindung wird aufgebaut..."); - result = client.authenticate(lblusername.getText(), passText); SessionData.session.setAuthToken(result.authToken); SessionData.session.setSessionID(result.sessionId); @@ -279,7 +273,7 @@ public class Login_GUI extends JFrame { // package from server is null login = false; lblConnectionInfo.setForeground(Color.red); - lblConnectionInfo.setText("Fehler: Verbindung nicht möglich."); + lblConnectionInfo.setText("Fehler: Client nicht mit Server verbunden."); } @@ -305,13 +299,13 @@ public class Login_GUI extends JFrame { if (client != null) { // client contains information isClientReturnedCorrectly = true; - System.out.println("Server " + masterServerIP - + " ist erreichbar, Verbindungsinformationen erhalten"); + System.out.println("Masterserver (" + masterServerIP + + ") ist erreichbar, Verbindungsinformationen erhalten"); } else { // client has returned with error isClientReturnedCorrectly = false; - System.out.println("Fehler: Client " + masterServerIP - + " hat keine korrekten Verbindungsdaten erhalten."); + System.out.println("Fehler: Client hat von Masterserver (" + masterServerIP + + ") hat keine korrekten Verbindungsdaten erhalten."); } return isClientReturnedCorrectly; -- cgit v1.2.3-55-g7522 From a751709ab1ca2e35a5e2ab6996d00604bbe07f6d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 16:02:29 +0200 Subject: GUI-Texte angepasst --- .../bin/gui/image/CreateImageAllgemein_GUI.class | Bin 7800 -> 7817 bytes .../bin/gui/image/CreateImageTechnisch_GUI.class | Bin 8788 -> 8784 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9112 -> 9131 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 8511 -> 8510 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12312 -> 12329 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 9974 -> 10017 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 11868 -> 11887 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 1094 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 951 bytes .../bin/gui/image/SearchEditImage_GUI$4.class | Bin 1298 -> 1298 bytes .../bin/gui/image/SearchEditImage_GUI$5.class | Bin 938 -> 938 bytes .../bin/gui/image/SearchEditImage_GUI$6.class | Bin 1771 -> 1771 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$8.class | Bin 980 -> 980 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2177 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 11743 -> 11762 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 704 -> 1066 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 1273 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 806 -> 927 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 1274 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 793 -> 914 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1354 -> 1747 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 832 -> 1917 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 835 -> 956 bytes .../bin/gui/image/SearchImage_GUI$9.class | Bin 972 -> 0 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 11812 -> 11552 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1106 -> 1106 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9013 -> 9013 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class | Bin 692 -> 692 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 1928 -> 1967 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10296 -> 10297 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10794 -> 10819 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 9977 -> 10004 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 6486 -> 6505 bytes .../gui/lecture/SearchMethodLecture_GUI$1.class | Bin 762 -> 0 bytes .../gui/lecture/SearchMethodLecture_GUI$2.class | Bin 851 -> 0 bytes .../gui/lecture/SearchMethodLecture_GUI$3.class | Bin 891 -> 0 bytes .../gui/lecture/SearchMethodLecture_GUI$4.class | Bin 1059 -> 0 bytes .../bin/gui/lecture/SearchMethodLecture_GUI.class | Bin 7022 -> 0 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 2 +- .../src/gui/image/CreateImageTechnisch_GUI.java | 6 +- .../src/gui/image/EditImageAllgemein_GUI.java | 2 +- .../src/gui/image/EditImageTechnisch_GUI.java | 6 +- .../src/gui/image/FTPCreateUploader_GUI.java | 2 +- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 24 +- .../src/gui/image/FTPEditUploader_GUI.java | 2 +- .../src/gui/image/SearchEditImage_GUI.java | 3 +- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 121 +++--- .../src/gui/image/SearchImage_GUI_alt.java | 459 +++++++++++++++++++++ .../src/gui/image/SearchMethodLecture_GUI.java | 251 +++++++++++ Dozentenmodul/src/gui/intro/Login_GUI.java | 2 - Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 97 +++-- .../gui/lecture/CreateLectureAllgemein_GUI.java | 2 +- .../src/gui/lecture/CreateLectureLink_GUI.java | 4 +- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 2 +- .../src/gui/lecture/EditLectureLink_GUI.java | 4 +- .../src/gui/lecture/EditLectureSearch_GUI.java | 3 +- .../gui/lecture/ExtendedSearchForImages_GUI.java | 2 +- .../src/gui/lecture/SearchLecture_GUI.java | 405 ++++++++++++++++++ .../src/gui/lecture/SearchMethodLecture_GUI.java | 246 ----------- 63 files changed, 1268 insertions(+), 377 deletions(-) delete mode 100644 Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class delete mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class delete mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class delete mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class delete mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class create mode 100644 Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java create mode 100644 Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java create mode 100644 Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java delete mode 100644 Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class index c14c26e5..60d254b9 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class index 2e49913b..6fa84ba9 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index c0b072cf..75dbaaf3 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class index edcd12d8..7b09a9c7 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 785ecb6b..e933f11b 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index dca740f2..b93f9f90 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index d3571c94..4a557c2e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class index 9e30be11..56f4b278 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class 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 index ff02ba32..7b7a41f8 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class 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 index 5b3e93a0..0715d19e 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class 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 index e0ebd234..6514ae56 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class 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 index f0cfc5da..12325d18 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class 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 index b6600cc8..0f16c43d 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class 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 index 772ed400..70809568 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class 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 index ffde361f..f8ac881a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class 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 index e2b34c9a..2357c0ec 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class 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 index 264f9d4a..2725d84c 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class 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 index 8dbd7362..18f964fe 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class 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 index 7c32f943..2aff1b68 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class 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 index 5b8f3f8b..8c3cee86 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class 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 index f842a022..5d5e2cfd 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class 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 index 2452046f..7e564db6 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class 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 index eff43b91..1138b2dc 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class 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 index 8b9f3286..6618191d 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class 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 index a5ff7a18..9096233b 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class 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 deleted file mode 100644 index e5ad916e..00000000 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$9.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index fdefc8b5..6244e1eb 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index cbc73803..b06e1848 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class 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 index 6ecad17e..beaa50e5 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 50bfcef4..75e8282e 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index d707d899..0d712499 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class 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 index 59f25618..a6abdea4 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class 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 index 76da6ffd..f5dd77e7 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index d9838839..44b3e14d 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 031b69b7..58677633 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class index 83d7cf3e..81bbec82 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class index 665f51d1..14d5f97e 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class deleted file mode 100644 index b8590387..00000000 Binary files a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$1.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class deleted file mode 100644 index 975fb7c1..00000000 Binary files a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$2.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class deleted file mode 100644 index 9d4fc780..00000000 Binary files a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$3.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class deleted file mode 100644 index 46f15114..00000000 Binary files a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class b/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class deleted file mode 100644 index 92a6a519..00000000 Binary files a/Dozentenmodul/bin/gui/lecture/SearchMethodLecture_GUI.class and /dev/null differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index bf1d0230..63483e3d 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -75,7 +75,7 @@ public class CreateImageAllgemein_GUI extends JFrame { e.printStackTrace(); } //Setzt den Titel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); //Zentriert das Fenster Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index e9d2d91a..cf71082c 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -82,7 +82,7 @@ public class CreateImageTechnisch_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width - 603) / 2; @@ -96,7 +96,7 @@ public class CreateImageTechnisch_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten"); + JLabel lblNewLabel = new JLabel("Eingabe technischer Daten"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -105,7 +105,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie.setText("Geben Sie hier bitte einige technische Daten ein"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index b80e4953..e5dc45c7 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -79,7 +79,7 @@ public class EditImageAllgemein_GUI extends JFrame { e.printStackTrace(); } //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); //Zentriert das Fenster in der Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 7d9de383..631e3c2d 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -73,7 +73,7 @@ public class EditImageTechnisch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Titel des Fensters - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -88,7 +88,7 @@ public class EditImageTechnisch_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten"); + JLabel lblNewLabel = new JLabel("Eingabe technischer Daten"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -98,7 +98,7 @@ public class EditImageTechnisch_GUI extends JFrame { txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); txtpnBitteWhlenSie - .setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + .setText("Geben Sie hier bitte einige technische Daten ein."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 1bf8cc3a..1777e27d 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -121,7 +121,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index d0f789f4..9c6b2892 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -100,7 +100,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image herunterladen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; @@ -217,17 +217,17 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener panel.setBounds(10, 11, 577, 57); contentPanel.add(panel); - JLabel label = new JLabel("Eingabe Ihrer Daten"); - label.setFont(new Font("Tahoma", Font.BOLD, 18)); - label.setBounds(10, 11, 509, 22); - panel.add(label); - - 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); + JLabel lblImageDownloader = new JLabel("Image Downloader"); + lblImageDownloader.setFont(new Font("Tahoma", Font.BOLD, 18)); + lblImageDownloader.setBounds(10, 11, 509, 22); + panel.add(lblImageDownloader); + + JTextPane txtpnWhlenSieEinen = new JTextPane(); + txtpnWhlenSieEinen.setText("W\u00E4hlen Sie einen Ort aus, um das von Ihnen gw\u00E4hlte Image erunter zu laden."); + txtpnWhlenSieEinen.setEditable(false); + txtpnWhlenSieEinen.setBackground(SystemColor.menu); + txtpnWhlenSieEinen.setBounds(10, 36, 509, 32); + panel.add(txtpnWhlenSieEinen); JSeparator separator = new JSeparator(); separator.setBounds(0, 79, 597, 2); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index b184c96c..b1415ef9 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -124,7 +124,7 @@ public class FTPEditUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp*"); + setTitle("Dozentenmodul *Prototyp* - Image bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index e6bb055e..c54e0b66 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -2,7 +2,6 @@ package gui.image; import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -115,7 +114,7 @@ public class SearchEditImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 493230d3..03b0f136 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -20,12 +20,12 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; @@ -44,6 +44,9 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; +import models.Image; +import models.person; +//import models.person; import org.apache.thrift.TException; @@ -63,7 +66,7 @@ public class SearchImage_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; + "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = con.getThriftConnection(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); @@ -75,16 +78,12 @@ public class SearchImage_GUI extends JFrame { /** * 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(); } } */ - public static void main(String[] args) { - try { - SearchImage_GUI dialog = new SearchImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. @@ -94,8 +93,14 @@ public class SearchImage_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); System.exit(0); } + + @Override + public void windowOpened(WindowEvent arg0) { + textFieldName.requestFocusInWindow(); + } }); // Verhindert das Vergrößern Des Fensters setResizable(false); @@ -109,7 +114,7 @@ public class SearchImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -192,6 +197,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI + con.closeThriftConnection(); ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -237,6 +243,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü + con.closeThriftConnection(); SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -269,11 +276,13 @@ public class SearchImage_GUI extends JFrame { System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { - } else if (tabbedPane.getSelectedIndex() == 1) { - String username = "Spitzer Tobias"; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + // String username="Spitzer Tobias"; rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - // rowSorterMyImages.toggleSortOrder(0); + } else if (tabbedPane.getSelectedIndex() == 1) { + } } @@ -281,17 +290,7 @@ public class SearchImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages = new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages = new JTable(); @@ -302,13 +301,23 @@ public class SearchImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); - tableAllImages.setRowSorter(rowSorterAll); - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages = new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); scrollPaneMyImage.setViewportView(tablemyImages); tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages = new JTable(); @@ -356,9 +365,28 @@ public class SearchImage_GUI extends JFrame { btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Öffnet den Downloader - FTPDownloader_GUI down = new FTPDownloader_GUI(); - down.setVisible(true); - SearchImage_GUI.this.setVisible(false); + + if (tablemyImages.getSelectedRow() != -1) { + String imageid = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion = modelMyImages.getValueAt( + tablemyImages.convertRowIndexToModel(tablemyImages + .getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchImage_GUI.this.setVisible(false); + FTPDownloader_GUI down = new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + } else { + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein Image für den Download aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } } }); btnDownload.setBounds(449, 508, 118, 23); @@ -370,33 +398,19 @@ public class SearchImage_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü + con.closeThriftConnection(); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); } }); - cancelButton.setActionCommand("OK"); - buttonPane.add(cancelButton); - getRootPane().setDefaultButton(cancelButton); - } - { - JButton continueButton = new JButton("Weiter"); - continueButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - con.closeThriftConnection(); - EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); } } @@ -427,8 +441,8 @@ public class SearchImage_GUI extends JFrame { List images; try { // Hole eine Liste der Images - images = client.getImageList(); + Iterator i = images.iterator(); int x = 0; @@ -440,7 +454,8 @@ public class SearchImage_GUI extends JFrame { images.get(x).getOsName(), images.get(x).getLectureName(), images.get(x).getUserData(), - images.get(x).getUpdateTime() }; + images.get(x).getUpdateTime(), "", images.get(x).id, + images.get(x).getVersion() }; // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java b/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java new file mode 100644 index 00000000..85e8da21 --- /dev/null +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.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_alt 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_alt dialog = new SearchImage_GUI_alt(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchImage_GUI_alt() { + 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_alt.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_alt.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/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java new file mode 100644 index 00000000..49d7810b --- /dev/null +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -0,0 +1,251 @@ +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.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 rdbtnSearchByImage; + JRadioButton rdbtnSearchByLecture; + 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* - Suchmethode w\u00E4hlen"); + 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("Suchmethode ausw\u00E4hlen"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie + .setText("Geben Sie bitte an, nach welchem Kriterium Sie suchen m\u00F6chten."); + 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); + + rdbtnSearchByImage = new JRadioButton( + "Nach einem VL-Image oder Vorlagen suchen"); + buttonGroup.add(rdbtnSearchByImage); + rdbtnSearchByImage.setBounds(6, 38, 545, 23); + panel_1.add(rdbtnSearchByImage); + + JTextArea txtrHierKlickenWenn = new JTextArea(); + txtrHierKlickenWenn.setBackground(SystemColor.menu); + txtrHierKlickenWenn.setLineWrap(true); + txtrHierKlickenWenn.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrHierKlickenWenn + .setText("Hier klicken, wenn Sie nach einem konkreten Image suchen, von dem Sie exakte Daten kennen. Hierzu geh\u00F6ren z.B. das Betriebssystem oder die installierte Software.\r\nEs werden zudem alle Vorlagen aufgelistet."); + txtrHierKlickenWenn.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); + + rdbtnSearchByLecture = new JRadioButton( + "Nach einer Veranstaltung suchen"); + buttonGroup.add(rdbtnSearchByLecture); + rdbtnSearchByLecture.setBounds(6, 180, 545, 23); + panel_1.add(rdbtnSearchByLecture); + + JPanel panel = new JPanel(); + panel.setBounds(10, 402, 577, 33); + contentPanel.add(panel); + panel.setLayout(null); + panel.setBorder(new EmptyBorder(5, 5, 5, 5)); + panel.setBackground(SystemColor.menu); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + SearchMethodLecture_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + 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 backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + 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) { + + if (rdbtnSearchByImage.isSelected() == true) { + SearchImage_GUI si = new SearchImage_GUI(); + si.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); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu = new JMenu("Suchen"); + menuBar.add(mnNewMenu); + + JMenuItem mntmVlSuche = new JMenuItem("VL Suche"); + mnNewMenu.add(mntmVlSuche); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + } +} diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 27b3cd18..dcd90969 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -12,8 +12,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 99c240f3..da76abf6 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -44,9 +44,11 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnImageNew; JRadioButton rdbtnImageEdit; JRadioButton rdbtnImageSearchDownload; - JRadioButton rdbtnVeranstaltungNew; + JRadioButton rdbtnLectureNew; JRadioButton rdbtnImageDelete; - JRadioButton rdbtnVeranstaltungEdit; + JRadioButton rdbtnLectureEdit; + JRadioButton rdbtnLectureDelete; + JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); /** @@ -151,7 +153,6 @@ public class MainMenue_GUI extends JFrame { panelImage.add(rdbtnImageDelete); rdbtnImageSearchDownload = new JRadioButton("Suche und Download"); - rdbtnImageSearchDownload.setEnabled(false); buttonGroup.add(rdbtnImageSearchDownload); rdbtnImageSearchDownload .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); @@ -190,39 +191,38 @@ public class MainMenue_GUI extends JFrame { panelVeranstaltung.setBounds(10, 327, 270, 170); contentPanel.add(panelVeranstaltung); - rdbtnVeranstaltungNew = new JRadioButton("Neu"); - buttonGroup.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew + rdbtnLectureNew = new JRadioButton("Neu"); + buttonGroup.add(rdbtnLectureNew); + rdbtnLectureNew .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23); - panelVeranstaltung.add(rdbtnVeranstaltungNew); - rdbtnVeranstaltungNew.setBackground(SystemColor.menu); + rdbtnLectureNew.setBounds(6, 24, 185, 23); + panelVeranstaltung.add(rdbtnLectureNew); + rdbtnLectureNew.setBackground(SystemColor.menu); - rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten"); - rdbtnVeranstaltungEdit + rdbtnLectureEdit = new JRadioButton("Bearbeiten"); + rdbtnLectureEdit .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); - rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23); - panelVeranstaltung.add(rdbtnVeranstaltungEdit); - buttonGroup.add(rdbtnVeranstaltungEdit); - rdbtnVeranstaltungEdit.setBackground(SystemColor.menu); - - JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen"); - rdbtnVeranstaltungDelete.setEnabled(false); - rdbtnVeranstaltungDelete + rdbtnLectureEdit.setBounds(6, 50, 230, 23); + panelVeranstaltung.add(rdbtnLectureEdit); + buttonGroup.add(rdbtnLectureEdit); + rdbtnLectureEdit.setBackground(SystemColor.menu); + + rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); + rdbtnLectureDelete.setEnabled(false); + rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungDelete); - buttonGroup.add(rdbtnVeranstaltungDelete); - rdbtnVeranstaltungDelete.setBackground(SystemColor.menu); - - JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche"); - rdbtnVeranstaltungSearch.setEnabled(false); - buttonGroup.add(rdbtnVeranstaltungSearch); - rdbtnVeranstaltungSearch + rdbtnLectureDelete.setBounds(6, 76, 175, 23); + panelVeranstaltung.add(rdbtnLectureDelete); + buttonGroup.add(rdbtnLectureDelete); + rdbtnLectureDelete.setBackground(SystemColor.menu); + + rdbtnLectureSearch = new JRadioButton("Suche"); + buttonGroup.add(rdbtnLectureSearch); + rdbtnLectureSearch .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnVeranstaltungSearch.setBackground(SystemColor.menu); - rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23); - panelVeranstaltung.add(rdbtnVeranstaltungSearch); + rdbtnLectureSearch.setBackground(SystemColor.menu); + rdbtnLectureSearch.setBounds(6, 102, 175, 23); + panelVeranstaltung.add(rdbtnLectureSearch); JPanel panelNews = new JPanel(); panelNews.setLayout(null); @@ -272,24 +272,24 @@ public class MainMenue_GUI extends JFrame { txtDesc.setText(descSearchImage); } }); - rdbtnVeranstaltungNew.addActionListener(new ActionListener() { + rdbtnLectureNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; txtDesc.setText(descNewLecture); } }); - rdbtnVeranstaltungEdit.addActionListener(new ActionListener() { + rdbtnLectureEdit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; txtDesc.setText(descEditLecture); } }); - rdbtnVeranstaltungDelete.addActionListener(new ActionListener() { + rdbtnLectureDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; } }); - rdbtnVeranstaltungSearch.addActionListener(new ActionListener() { + rdbtnLectureSearch.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; txtDesc.setText(descSearchLecture); @@ -343,32 +343,43 @@ public class MainMenue_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + //Images if (rdbtnImageNew.isSelected() == true) { CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); sr.setVisible(true); dispose(); } else if (rdbtnImageEdit.isSelected() == true) { - SearchEditImage_GUI si = new SearchEditImage_GUI(); si.setVisible(true); dispose(); - } else if (rdbtnImageSearchDownload.isSelected() == true) { - SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI(); - sm.setVisible(true); - dispose(); } else if (rdbtnImageDelete.isSelected() == true) { DeleteImage_GUI di = new DeleteImage_GUI(); di.setVisible(true); dispose(); - } else if (rdbtnVeranstaltungNew.isSelected() == true) { + } else if (rdbtnImageSearchDownload.isSelected() == true) { + //SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI(); + //SearchImage_GUI si = new SearchImage_GUI(); + SearchEditImage_GUI si = new SearchEditImage_GUI(); + si.setVisible(true); + dispose(); + //Lectures + } else if (rdbtnLectureNew.isSelected() == true) { CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); av.setVisible(true); dispose(); - } else if (rdbtnVeranstaltungEdit.isSelected() == true) { - //SearchEditLecture_GUI sl = new SearchEditLecture_GUI(); + } else if (rdbtnLectureEdit.isSelected() == true) { EditLectureSearch_GUI el = new EditLectureSearch_GUI(); el.setVisible(true); dispose(); + } else if (rdbtnLectureDelete.isSelected() == true) { + //DeleteLecture_GUI dl = new DeleteLecture_GUI(); + //dl.setVisible(true); + //dispose(); + } else if (rdbtnLectureSearch.isSelected() == true) { + //SearchLecture_GUI sl = new SearchLecture_GUI(); + EditLectureSearch_GUI sl = new EditLectureSearch_GUI(); + sl.setVisible(true); + dispose(); } } }); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 026cb7c5..02946571 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -100,7 +100,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 2243fd43..451ed9b4 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -105,7 +105,7 @@ public class CreateLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 603) / 2; int left = (screenSize.width - 722) / 2; @@ -122,7 +122,7 @@ public class CreateLectureLink_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen"); + JLabel lblNewLabel = new JLabel("Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 115a9f1f..348b1c77 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -90,7 +90,7 @@ public class EditLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index c1fdec80..4a4f6051 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -99,7 +99,7 @@ public class EditLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 603) / 2; int left = (screenSize.width - 722) / 2; @@ -117,7 +117,7 @@ public class EditLectureLink_GUI extends JFrame { panel.setLayout(null); { JLabel lblNewLabel = new JLabel( - "Image zur Verlinkung ausw\u00E4hlen"); + "Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index ae50fa22..475f0a5f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -1,6 +1,5 @@ package gui.lecture; -import gui.image.EditImageAllgemein_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; import java.awt.Dimension; @@ -116,7 +115,7 @@ public class EditLectureSearch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 3fc4b7f6..095ca7ef 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -72,7 +72,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Erweiterte Suche"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top=(screenSize.height - 722) / 2; int left=(screenSize.width -603) / 2; diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java new file mode 100644 index 00000000..a22578e1 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -0,0 +1,405 @@ +package gui.lecture; + +import gui.intro.MainMenue_GUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Iterator; +import java.util.List; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.RowFilter; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import models.person; +import org.apache.thrift.TException; +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchLecture_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JTable tableAllLectures; + JTable tablemyLectures; + JTable tableCoopImages; + JTable tablePublicVorlagen; + JTable tablePublicImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles = { "Veranstaltungsname", "Beschreibung", + "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "Verantwortlicher", "Image", "Schlagwort", "ID" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final TableRowSorter rowSorterAll = new TableRowSorter( + modelAll); + final TableRowSorter rowSorterMyLectures = new TableRowSorter( + modelMyLectures); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchLecture_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); + System.exit(0); + } + }); + // Verhindert das Vergrößern Des Fensters + setResizable(false); + + try { + // Setzt das Look & Feel auf System + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + // Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen"); + // Zentriert das Fenster in die Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + final DefaultTableModel model = new DefaultTableModel(titles, 0); + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Suche nach Veranstaltung"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie + .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 49, 557, 131); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + textFieldName = new JTextField(); + // Key Listener der Tastatureingabe registriert + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + // Textfield eingabe auslesen + String stext = textFieldName.getText(); + + // Wenn Textfield nicht leer + if (stext != "") { + // Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + + } + } + }); + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel( + "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(); + SearchLecture_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 75, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(152, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl"); + lblNewLabel_1.setBounds(166, 11, 128, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + 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); + initTableModel(modelMyLectures); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllLectures = new JTable(); + tableAllLectures.setModel(modelAll); + tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyLectures = new JTable(); + tablemyLectures.setModel(modelMyLectures); + + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); + tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, + null); + tableAllLectures.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllLectures); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + tableCoopImages = new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Veranstaltungen", null, + scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + tablePublicImages = new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + tablePublicVorlagen = new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton btnBack = new JButton("Zur\u00FCck"); + btnBack.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + btnBack.setActionCommand("OK"); + buttonPane.add(btnBack); + getRootPane().setDefaultButton(btnBack); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + } + + // Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model) { + List 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 deleted file mode 100644 index ae31236a..00000000 --- a/Dozentenmodul/src/gui/lecture/SearchMethodLecture_GUI.java +++ /dev/null @@ -1,246 +0,0 @@ -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 From 02866d8fd341efa33fb0059b10e9b7ed1e0bc89e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 16:06:21 +0200 Subject: testtttt --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11839 -> 11839 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 20 +++++++++----------- Dozentenmodulserver/bin/sql/SQL.class | Bin 15359 -> 15433 bytes Dozentenmodulserver/src/sql/SQL.java | 5 +++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 5e67252a..28742b7d 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index fb2d5926..376d7c5f 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -365,10 +365,6 @@ public class DeleteImage_GUI extends JFrame { btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - int index; - String id; - String version; - //frage, soll das selektierte Daten gelöscht werden? int eingabe = JOptionPane.showConfirmDialog(null, "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); @@ -384,14 +380,16 @@ public class DeleteImage_GUI extends JFrame { //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. //Unbdingt abfragen! - try { - if(client.connectedToEvents(imageid ,imageversion)) { - + //try { + //if(client.connectedToEvents(imageid ,imageversion)) { + System.out.println("entrou1"); try { if (client.deleteImageData(imageid ,imageversion) && client.deleteImageServer(imageid ,imageversion)) { - JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", + System.out.println("entrou2"); + + JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", imageversion, JOptionPane.OK_CANCEL_OPTION); } else { @@ -417,11 +415,11 @@ public class DeleteImage_GUI extends JFrame { //FileUtils.ForceDelete (.. ); } - } catch (TException e) { + /*} catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - } - } + } */ + //} } }); btnDelete.setBounds(449, 508, 118, 23); diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index ced9ab3a..4479bf2c 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index ed1acbec..1c34d226 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -527,11 +527,12 @@ public class SQL { Statement stm=con.createStatement(); - stm.executeUpdate("SELECT ...VERANSTALTUNG_VERKNÜPFUNG... FROM " + + ResultSet rs = stm.executeQuery("SELECT ...VERANSTALTUNG_VERKNÜPFUNG... FROM " + "bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + "AND imageVersion = '"+version+"';"); - return true; + return !rs.wasNull(); + } catch (SQLException e) { // TODO Auto-generated catch block -- cgit v1.2.3-55-g7522 From 991998552c28daf28fd331cdcf8f8e3796fa1820 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 17:01:44 +0200 Subject: Weiteres Debugging eingefügt --- .../bin/server/BinaryListener.class | Bin 2456 -> 2464 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 11415 -> 13223 bytes Dozentenmodulserver/bin/server/startServer.class | Bin 1891 -> 2057 bytes Dozentenmodulserver/src/server/BinaryListener.java | 2 +- Dozentenmodulserver/src/server/ServerHandler.java | 294 ++++++++++++--------- Dozentenmodulserver/src/server/startServer.java | 2 + 6 files changed, 165 insertions(+), 133 deletions(-) diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class index d53cdc9d..4a135f2d 100644 Binary files a/Dozentenmodulserver/bin/server/BinaryListener.class and b/Dozentenmodulserver/bin/server/BinaryListener.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 76357894..e51346e6 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class index 030b565e..14dc0861 100644 Binary files a/Dozentenmodulserver/bin/server/startServer.class and b/Dozentenmodulserver/bin/server/startServer.class differ diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index 8d592992..97793778 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -28,7 +28,7 @@ public class BinaryListener implements Runnable return; } TServer server = new TSimpleServer( new Args( transport ).processor( processor ) ); - log.info(new Date() +" - Started Running Server"); + log.info(new Date() +" - Started running BinaryListener"); server.serve(); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 9474d942..a6dd23e8 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -19,154 +19,174 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import org.apache.commons.io.FileUtils; +import org.apache.log4j.Logger; import org.apache.thrift.TException; import sql.SQL; import util.XMLCreator; - public class ServerHandler implements Server.Iface { - static SQL sql=new SQL(); - static Connection con=sql.getConnection(); + static SQL sql = new SQL(); + static Connection con = sql.getConnection(); + private static Logger log = Logger.getLogger(ServerHandler.class); + /** * @param args */ - /*public static void main(String[] args) { - // TODO Auto-generated method stub - - }*/ + /* + * public static void main(String[] args) { // TODO Auto-generated method + * stub + * + * } + */ @Override public User getFtpUser() throws TException { - User user=new User(); + log.info(new Date() + " - returing FTPUser..."); + User user = new User(); user.setUserName(UUID.randomUUID().toString().substring(0, 8)); - user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString().substring(0, 8))); + user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() + .substring(0, 8))); user.setPath("/srv/openslx/nfs/temp"); - SQL sql=new SQL(); - Connection con=sql.getConnection(); + SQL sql = new SQL(); + Connection con = sql.getConnection(); sql.writeFTPUser(con, user.getUserName(), user.getPassword()); + log.info(new Date() + " - successfully returned FTPUser"); return user; } - public String getEncodedSha1Sum(String key) { - try { - MessageDigest md = MessageDigest.getInstance( "SHA1" ); - md.update( key.getBytes() ); - return new BigInteger(1, md.digest()).toString(16); - } - catch (NoSuchAlgorithmException e) { - // handle error case to taste - } + try { + log.info(new Date() + " - returned EncodedSha1Sum..."); + MessageDigest md = MessageDigest.getInstance("SHA1"); + md.update(key.getBytes()); + log.info(new Date() + " - successfully returned EncodedSha1Sum"); + return new BigInteger(1, md.digest()).toString(16); + } catch (NoSuchAlgorithmException e) { + // handle error case to taste + } return null; } @Override public long DeleteFtpUser(String user) throws TException { int ret = sql.DeleteUser(con, user); + log.info(new Date() + " - deleting FTPUser"); return ret; } @Override - public String getPathOfImage(String image_id, String version) throws TException { - + public String getPathOfImage(String image_id, String version) + throws TException { + try { - ResultSet rs=sql.getPathOfImage(con, image_id, version); + log.info(new Date() + " - returning PathOfImage..."); + ResultSet rs = sql.getPathOfImage(con, image_id, version); System.out.println("Path SQL erfolgreich"); rs.next(); System.out.println(rs.getString("image_path")); + log.info(new Date() + " - successfully returned PathOfImage: " + + rs.getString("image_path")); return rs.getString("image_path"); } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + log.info(new Date() + " - returning PathOfImage: null"); return null; } @Override public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, - String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) - throws TException { - String login="tete"; - - int pk_institution=sql.setInstitution(con, university); - - int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - - sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename, imagePath); + String Fak, boolean license, boolean internet, long ram, long cpu, + String imagePath) throws TException { + String login = "tete"; + + int pk_institution = sql.setInstitution(con, university); + int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + new Date(), pk_institution); + + sql.setImageData(con, pk_person, license, internet, cpu, ram, + imagename, imagePath); + + log.info(new Date() + " - writing VLdata"); // TODO Auto-generated method stub return true; } @Override public List getImageList() throws TException { - ResultSet res=sql.getImageList(con); - + ResultSet res = sql.getImageList(con); + List list = new ArrayList(); try { - - while(res.next()) - { - - list.add(new Image(res.getString("GUID_imageID"),res.getString("imageVersion"),res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user"))); - + + while (res.next()) { + + list.add(new Image(res.getString("GUID_imageID"), res + .getString("imageVersion"), + res.getString("image_name"), res + .getString("cond_hasLicenseRestriction"), res + .getString("name"), res.getString("lecture"), + res.getString("image_update_time"), res + .getString("user"))); + } - + log.info(new Date() + " - returning ImageList: " + list.size()); return list; } catch (SQLException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - + log.info(new Date() + " - returning ImageList: " + list.size()); return null; } - @Override public List getAllOS() throws TException { - List list=new ArrayList<>(); - ResultSet rs=sql.getAllOS(con); + List list = new ArrayList<>(); + ResultSet rs = sql.getAllOS(con); try { - while(rs.next()) - { + while (rs.next()) { list.add(rs.getString("name")); } + log.info(new Date() + " - returning AllOS: " + list.size()); return list; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning AllOS: " + list.size()); return null; } @Override public Map getPersonData(String Vorname, String Nachname) throws TException { - Map map=new HashMap(); - - ResultSet rs=sql.getPersonData(con, Vorname, Nachname); + Map map = new HashMap(); + + ResultSet rs = sql.getPersonData(con, Vorname, Nachname); try { - while(rs.next()) - { - + while (rs.next()) { + map.put("mail", rs.getString("mail")); map.put("Nachname", rs.getString("Nachname")); map.put("Vorname", rs.getString("Vorname")); map.put("Hochschule", rs.getString("name")); - } + log.info(new Date() + " - returning PersonData: " + map.size()); return map; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning PersonData: " + map.size()); return null; } @@ -177,100 +197,109 @@ public class ServerHandler implements Server.Iface { String university, String Mail, String Tel, String Fak) throws TException { int pk_image = 0; - String login="tete"; + String login = "tete"; int imageversion = 0; - int pk_institution=sql.setInstitution(con, university); - int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - - ResultSet image=sql.getImageIDandVersion(con, imagename); - - try { - while(image.next()) - { - pk_image=image.getInt("GUID_imageID"); - imageversion=image.getInt("imageVersion"); - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - System.out.println(startDate); - sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive); - XMLCreator xml=new XMLCreator(con, name); - try { - xml.create(name); - System.out.println(new Date() + " - Creator beendet"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TransformerException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + int pk_institution = sql.setInstitution(con, university); + int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + new Date(), pk_institution); + + ResultSet image = sql.getImageIDandVersion(con, imagename); + + try { + while (image.next()) { + pk_image = image.getInt("GUID_imageID"); + imageversion = image.getInt("imageVersion"); } + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + System.out.println(startDate); + sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, + shortdesc, startDate, endDate, isActive); + XMLCreator xml = new XMLCreator(con, name); + try { + xml.create(name); + log.info(new Date() + " - XML created"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ParserConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TransformerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return false; } @Override public boolean startFileCopy(String file) throws TException { - File tmpFile=new File(file); + File tmpFile = new File(file); - System.out.println("Vor Move" +new Date()); + System.out.println("Vor Move" + new Date()); try { - //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? - FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); + // der übergebene Filename ist falsch - hier muss der generierte + // name geholt werden, nicht der ursprüngliche name. wo wird dieser + // eingelesen? + FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" + + tmpFile.getName())); + log.info(new Date() + " - file moved"); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } - - System.out.println("Nach Move"+new Date()); return true; } - @Override - public Map getImageData(String imageid, String imageversion) throws TException { - - ResultSet data=sql.getImageData(con, imageid, imageversion); - - Map map=new HashMap(); + public Map getImageData(String imageid, String imageversion) + throws TException { + + ResultSet data = sql.getImageData(con, imageid, imageversion); + + Map map = new HashMap(); try { - while(data.next()) - { - System.out.println(data.getString("cond_hasInternetRestriction")+data.getString("cond_hasLicenseRestriction")+data.getString("cond_minCPUs")+data.getString("cond_minRAM")); - map.put("name",data.getString("image_name")); - map.put("internet", data.getString("cond_hasInternetRestriction")); + while (data.next()) { + System.out.println(data + .getString("cond_hasInternetRestriction") + + data.getString("cond_hasLicenseRestriction") + + data.getString("cond_minCPUs") + + data.getString("cond_minRAM")); + map.put("name", data.getString("image_name")); + map.put("internet", + data.getString("cond_hasInternetRestriction")); map.put("license", data.getString("cond_hasLicenseRestriction")); map.put("cpu", data.getString("cond_minCPUs")); map.put("ram", data.getString("cond_minRAM")); - + } System.out.println("return success"); + log.info(new Date() + " - returning ImageData: "+map.size()); return map; } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } + log.info(new Date() + " - returning ImageData: "+map.size()); return null; } - @Override - public boolean updateImageData(String name, String newName,boolean license, - boolean internet, long ram, long cpu,String id, String version) throws TException { + public boolean updateImageData(String name, String newName, + boolean license, boolean internet, long ram, long cpu, String id, + String version) throws TException { System.out.println("Server: Vor Update"); - sql.UpdateImageData(con, name, newName ,license, internet, cpu, ram, id, version); + sql.UpdateImageData(con, name, newName, license, internet, cpu, ram, + id, version); System.out.println("Update erfolgreich"); + log.info(new Date() + " - updated ImageData"); return false; } - @Override public Map getLectureData(String lecturename) throws TException { @@ -278,54 +307,55 @@ public class ServerHandler implements Server.Iface { return null; } - @Override public List getLectureList() throws TException { - ResultSet res=sql.getLectureList(con); - + ResultSet res = sql.getLectureList(con); + List list = new ArrayList(); try { - - while(res.next()) - { - - list.add(new Lecture(res.getString("lectureID"), res.getString("name"), res.getString("isActive"), res.getString("startTime"), res.getString("endTime"), res.getString("lastUsed"), res.getString("description"), res.getString("image_name"), res.getString("user"))); - - } - + while (res.next()) { + + list.add(new Lecture(res.getString("lectureID"), res + .getString("name"), res.getString("isActive"), res + .getString("startTime"), res.getString("endTime"), res + .getString("lastUsed"), res.getString("description"), + res.getString("image_name"), res.getString("user"))); + + } + log.info(new Date() + " - returning LectureList: "+list.size()); return list; } catch (SQLException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } - + log.info(new Date() + " - returning LectureList: "+list.size()); return null; } - @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws TException { - int pk_image=0; - int imageversion=0; - ResultSet image=sql.getImageIDandVersion(con, imagename); + int pk_image = 0; + int imageversion = 0; + ResultSet image = sql.getImageIDandVersion(con, imagename); try { - while(image.next()) - { - pk_image=image.getInt("GUID_imageID"); - imageversion=image.getInt("imageVersion"); + while (image.next()) { + pk_image = image.getInt("GUID_imageID"); + imageversion = image.getInt("imageVersion"); } } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id); + sql.updateLectureData(con, pk_image, imageversion, lastname, newName, + desc, shortdesc, startDate, endDate, isActive, id); + log.info(new Date() + " - updated LectureData"); return false; } diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index e1ab22c0..542c92b8 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -28,6 +28,8 @@ public class startServer { t = new Thread(new BinaryListener()); servers.add(t); t.start(); + //information + log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); // Run more servers // ... // Wait for all servers to die -- cgit v1.2.3-55-g7522 From 05f774a71379f4bb795fd5c072bfa71469e1c409 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 17:11:24 +0200 Subject: konsolenausgaben funktionierender teile entfernt --- .../bin/gui/image/SearchEditImage_GUI$6.class | Bin 1771 -> 1637 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$8.class | Bin 980 -> 980 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2177 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 11762 -> 11762 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1747 -> 1613 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1917 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 956 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 11552 -> 11552 bytes Dozentenmodul/src/GUI/SearchImage_GUI.java | 458 -------------------- Dozentenmodul/src/gui/SearchImage_GUI.java | 458 -------------------- .../src/gui/image/SearchEditImage_GUI.java | 1 - Dozentenmodul/src/gui/image/SearchImage_GUI.java | 1 - .../src/gui/image/SearchImage_GUI_alt.java | 459 --------------------- .../src/gui/lecture/CreateLectureLink_GUI.java | 4 - .../src/gui/lecture/EditLectureLink_GUI.java | 4 - .../src/gui/lecture/EditLectureSearch_GUI.java | 14 - .../src/gui/lecture/SearchLecture_GUI.java | 1 - 18 files changed, 1400 deletions(-) delete mode 100644 Dozentenmodul/src/GUI/SearchImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/SearchImage_GUI.java delete mode 100644 Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class index 0f16c43d..3bbfbad4 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class 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 index 70809568..14b127f6 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class 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 index f8ac881a..d03d40d7 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class 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 index 2357c0ec..7d66e216 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class 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 index 2725d84c..8ca7d2fa 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class index 1138b2dc..3e0a8637 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class 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 index 6618191d..c01be42e 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class 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 index 9096233b..4161ee8a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index 6244e1eb..8568b3b2 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java deleted file mode 100644 index 83e6bc07..00000000 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ /dev/null @@ -1,458 +0,0 @@ -package gui; - - -import gui.image.EditImageAllgemein_GUI; -import gui.image.FTPDownloader_GUI; -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"); - 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 okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - 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) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_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); - - } - //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/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java deleted file mode 100644 index 83e6bc07..00000000 --- a/Dozentenmodul/src/gui/SearchImage_GUI.java +++ /dev/null @@ -1,458 +0,0 @@ -package gui; - - -import gui.image.EditImageAllgemein_GUI; -import gui.image.FTPDownloader_GUI; -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"); - 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 okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - 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) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_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); - - } - //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/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index c54e0b66..d5c48764 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -273,7 +273,6 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 03b0f136..bb1e8aa7 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -273,7 +273,6 @@ public class SearchImage_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java b/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java deleted file mode 100644 index 85e8da21..00000000 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI_alt.java +++ /dev/null @@ -1,459 +0,0 @@ -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_alt 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_alt dialog = new SearchImage_GUI_alt(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchImage_GUI_alt() { - 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_alt.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_alt.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/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 451ed9b4..11d3131e 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -374,10 +374,6 @@ public class CreateLectureLink_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); - System.out.println("Veranstaltung angelegt um: " - + formatter.format( - Lecture.lecture.getStartdate()) - .toString()); client.writeLecturedata( Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 4a4f6051..4160f855 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -370,14 +370,10 @@ public class EditLectureLink_GUI extends JFrame { String imagename = tableAllImages.getValueAt( tableAllImages.getSelectedRow(), 0) .toString(); - System.out.println("ID: "+Lecture.lecture.getid()); try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - System.out.println( formatter.format( - Lecture.lecture.getEnddate()) - .toString()); client.updateLecturedata(Lecture.lecture.getName(), Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 475f0a5f..badcf86a 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -239,7 +239,6 @@ public class EditLectureSearch_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " @@ -352,19 +351,6 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnContinue = new JButton("Weiter"); btnContinue.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - System.out - .println("\ntableAllImages.getSelectedRow() = " - + tableAllLectures.getSelectedRow() - + "\ntablemyImages.getSelectedRow() = " - + tablemyLectures.getSelectedRow() - + "\ntableCoopImages.getSelectedRow() = " - + tableCoopImages.getSelectedRow() - + "\ntablePublicImages.getSelectedRow() = " - + tablePublicImages.getSelectedRow() - + "\ntablePublicVorlagen.getSelectedRow() = " - + tablePublicVorlagen.getSelectedRow()); - // check if a row is selected if ((tableAllLectures.getSelectedRow() != -1) || (tablemyLectures.getSelectedRow() != -1) diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index a22578e1..413f1084 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -234,7 +234,6 @@ public class SearchLecture_GUI extends JFrame { tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); if (tabbedPane.getSelectedIndex() == 0) { String username = person.verantwortlicher.getName() + " " -- cgit v1.2.3-55-g7522 From 256d0ef72fe6158f45197dd48ff6acf9f90766c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Apr 2014 18:02:34 +0200 Subject: dfsvfds --- Dozentenmodulserver/bin/server/ServerHandler.class | Bin 4044 -> 13856 bytes Dozentenmodulserver/src/server/ServerHandler.java | 8 -------- 2 files changed, 8 deletions(-) diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 8f9b9c51..6a7243b9 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 3bf1eddf..fda5da46 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -241,18 +241,15 @@ public class ServerHandler implements Server.Iface { System.out.println("Vor Move" + new Date()); try { -<<<<<<< HEAD //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); -======= // der übergebene Filename ist falsch - hier muss der generierte // name geholt werden, nicht der ursprüngliche name. wo wird dieser // eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" + tmpFile.getName())); log.info(new Date() + " - file moved"); ->>>>>>> 05f774a71379f4bb795fd5c072bfa71469e1c409 } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -340,11 +337,6 @@ public class ServerHandler implements Server.Iface { return null; } -<<<<<<< HEAD - - -======= ->>>>>>> 05f774a71379f4bb795fd5c072bfa71469e1c409 @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, -- cgit v1.2.3-55-g7522 From b78800aac8b52bb44e11b798346ca3fafe18c8bd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 10:41:04 +0200 Subject: Verbindung korrigiert --- Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class | Bin 1298 -> 0 bytes Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class | Bin 938 -> 0 bytes Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class | Bin 980 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class delete mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class delete mode 100644 Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class deleted file mode 100644 index 6514ae56..00000000 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class deleted file mode 100644 index 12325d18..00000000 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class deleted file mode 100644 index d03d40d7..00000000 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class and /dev/null differ -- cgit v1.2.3-55-g7522 From a3dd489cae8d3fa6dd748bbcd57eeba8f3df07fd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 10:41:10 +0200 Subject: g --- Dozentenmodulserver/bin/server/ServerHandler.class | Bin 4044 -> 13856 bytes Dozentenmodulserver/src/server/ServerHandler.java | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 8f9b9c51..0d846cb7 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 3bf1eddf..a411d19f 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -241,18 +241,17 @@ public class ServerHandler implements Server.Iface { System.out.println("Vor Move" + new Date()); try { -<<<<<<< HEAD + //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); - -======= + // der übergebene Filename ist falsch - hier muss der generierte // name geholt werden, nicht der ursprüngliche name. wo wird dieser // eingelesen? FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" + tmpFile.getName())); log.info(new Date() + " - file moved"); ->>>>>>> 05f774a71379f4bb795fd5c072bfa71469e1c409 + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -340,11 +339,7 @@ public class ServerHandler implements Server.Iface { return null; } -<<<<<<< HEAD - -======= ->>>>>>> 05f774a71379f4bb795fd5c072bfa71469e1c409 @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, -- cgit v1.2.3-55-g7522 From cbc155422ac3181ee04e75653e6f302594a2e006 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 10:41:11 +0200 Subject: Verbindung korrigiert --- Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9013 -> 9009 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 1590 -> 1928 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 2 +- Dozentenmodul/src/thrift/ThriftConnection.java | 8 +- Dozentenmodulserver/bin/sql/SQL.class | Bin 15446 -> 15418 bytes Dozentenmodulserver/src/sql/SQL.java | 185 +++++++++++------------- 6 files changed, 92 insertions(+), 103 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 0d712499..ea041701 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index bebd7389..fa1d8d58 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index dcd90969..aa28b3b6 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -303,7 +303,7 @@ public class Login_GUI extends JFrame { // client has returned with error isClientReturnedCorrectly = false; System.out.println("Fehler: Client hat von Masterserver (" + masterServerIP - + ") hat keine korrekten Verbindungsdaten erhalten."); + + ") keine korrekten Verbindungsdaten erhalten."); } return isClientReturnedCorrectly; diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 648d8f86..058128a4 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -1,5 +1,7 @@ package thrift; +import models.SessionData; + import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; @@ -10,7 +12,9 @@ import server.Server; import server.Server.Client; public class ThriftConnection { - final TTransport transport = new TSocket("141.79.128.121", 9090); + + private String satAddress = ""+SessionData.session.getServerAdress(); + final TTransport transport = new TSocket(satAddress, 9090); //final TTransport transport = new TSocket("141.79.128.102", 9090); public Client getThriftConnection() { @@ -26,7 +30,7 @@ public class ThriftConnection { final Server.Client client = new Server.Client(protocol); - System.out.println("Verbindung wurde aufgebaut."); + System.out.println("Verbindung wurde aufgebaut. Satellit="+satAddress); return client; } diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 9310440e..88cc19e7 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index daffbf0b..5ae5fde0 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -1,10 +1,7 @@ package sql; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -18,8 +15,8 @@ import server.ServerHandler; public class SQL { - private static Logger log = Logger.getLogger( BinaryListener.class ); - + private static Logger log = Logger.getLogger(BinaryListener.class); + public Connection getConnection() { try { Class.forName("com.mysql.jdbc.Driver").newInstance(); @@ -54,7 +51,8 @@ public class SQL { + pass + "'),'10001','12345','/srv/openslx/nfs/temp');"); con.commit(); - log.info(new Date() + " - created FTPUser "+user+" : "+pass+"."); + log.info(new Date() + " - created FTPUser " + user + " : " + pass + + "."); return ret; } catch (SQLException e) { // TODO Auto-generated catch block @@ -73,11 +71,11 @@ public class SQL { .executeUpdate("DELETE FROM `bwLehrpool`.`FtpUsers` where User like '" + user + "';"); con.commit(); - log.info(new Date() + " - FTPUser "+user+" deleted."); + log.info(new Date() + " - FTPUser " + user + " deleted."); return ret; } catch (SQLException e) { // TODO Auto-generated catch block - log.info(new Date() + " - Could not delete FTPUser "+user+"."); + log.info(new Date() + " - Could not delete FTPUser " + user + "."); e.printStackTrace(); } return -1; @@ -215,44 +213,31 @@ public class SQL { Random random = new Random(); int uid = random.nextInt(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('" - + uid //GUID_imageID - + "',1,'" //imageVersion - + imagename //image_name - + "','" - + imagePath //image_path - + "','" - + formatter.format(new Date()) //image_lastCall - + "','" - + formatter.format(new Date()) //image_create_time - + "','" - + formatter.format(new Date()) //image_update_time - + "','" - + pk_person //image_owner - + "','" - + pk_person //image_change_by - + "','" - + formatter.format(new Date()) //rec_create_time - + "','" - + formatter.format(new Date()) //rec_change_time - + "','" - + pk_person //rec_owner - + "','" - + pk_person //rec_change_by - + "',0" //content_operatingSystem - + ",1" //status_isCompressed - + ",1" //status_isSecure - + ",1" //status_isOptimzed - + ",1" //status_isValid - + ",1" //status_isReady - + ",0" //status_isDeleted - + ",0,'" //status_isLastOfficialVersion - + license_bol //cond_hasLicenseRestriction - + "','" - + internet_bol //cond_hasInternetRestriction - + "','" - + ram //cond_minRAM - + "','" - + cpu //cond_minCPUs + + uid // GUID_imageID + + "',1,'" // imageVersion + + imagename // image_name + + "','" + imagePath // image_path + + "','" + formatter.format(new Date()) // image_lastCall + + "','" + formatter.format(new Date()) // image_create_time + + "','" + formatter.format(new Date()) // image_update_time + + "','" + pk_person // image_owner + + "','" + pk_person // image_change_by + + "','" + formatter.format(new Date()) // rec_create_time + + "','" + formatter.format(new Date()) // rec_change_time + + "','" + pk_person // rec_owner + + "','" + pk_person // rec_change_by + + "',0" // content_operatingSystem + + ",1" // status_isCompressed + + ",1" // status_isSecure + + ",1" // status_isOptimzed + + ",1" // status_isValid + + ",1" // status_isReady + + ",0" // status_isDeleted + + ",0,'" // status_isLastOfficialVersion + + license_bol // cond_hasLicenseRestriction + + "','" + internet_bol // cond_hasInternetRestriction + + "','" + ram // cond_minRAM + + "','" + cpu // cond_minCPUs + "');"); con.commit(); @@ -448,8 +433,6 @@ public class SQL { } return -1; } - - /** * @@ -457,33 +440,33 @@ public class SQL { * @param version * @return */ - - public boolean deleteImage(Connection con, String id, String version) { - - System.out.println("delete image"); - + + public boolean deleteImage(Connection con, String id, String version) { + + System.out.println("delete image"); + try { - Statement stm=con.createStatement(); - + Statement stm = con.createStatement(); System.out.println("delete image"); - - stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + - "AND imageVersion = '"+version+"';"); - + + stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + + id + "' " + "AND imageVersion = '" + version + "';"); + return true; - + } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + return false; - } - + } + public int updateLectureData(Connection con, int pk_image, - int imageversion, String name, String newName ,String desc, String shortdesc, - String start, String end, boolean isactive, String id) { + int imageversion, String name, String newName, String desc, + String shortdesc, String start, String end, boolean isactive, + String id) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); int active_bol = 0; @@ -494,54 +477,56 @@ public class SQL { try { Statement stm = con.createStatement(); stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '" - +newName - +"',`isActive` = '" - +active_bol - +"',`startTime` = '" - +start - +"',`endTime` = '" - +end - +"',`description` = '" - +desc - +"',`imageID` = '" - +pk_image - +"',`imageVersion` = '" - +imageversion - +"',`admin_changeTime` = '" - +formatter.format(new Date()) - +"'WHERE `lectureID` = '" - +id+"';" ); + + newName + + "',`isActive` = '" + + active_bol + + "',`startTime` = '" + + start + + "',`endTime` = '" + + end + + "',`description` = '" + + desc + + "',`imageID` = '" + + pk_image + + "',`imageVersion` = '" + + imageversion + + "',`admin_changeTime` = '" + + formatter.format(new Date()) + + "'WHERE `lectureID` = '" + id + "';"); con.commit(); - } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + return 0; } - - public boolean connectedToEvents (Connection con, String id, String version) { - + + public boolean connectedToEvents(Connection con, String id, String version) { + try { - Statement stm=con.createStatement(); - - ResultSet rs = stm.executeQuery("SELECT ...VERANSTALTUNG_VERKNÜPFUNG... FROM " + - "bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " + - "AND imageVersion = '"+version+"';"); - + Statement stm = con.createStatement(); + + ResultSet rs = stm + .executeQuery("SELECT ...VERANSTALTUNG_VERKNÜPFUNG... FROM " + + "bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + + id + + "' " + + "AND imageVersion = '" + + version + + "';"); + return !rs.wasNull(); - - + } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + return false; - - } + + } } -- cgit v1.2.3-55-g7522 From 1f28f4c2ebfd4c6631581b8af54017c8833bb9c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 11:46:39 +0200 Subject: rthf --- Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 1928 -> 1960 bytes Dozentenmodul/src/thrift/ThriftConnection.java | 6 ++++-- Dozentenmodulserver/bin/sql/SQL.class | Bin 15418 -> 15502 bytes Dozentenmodulserver/src/sql/SQL.java | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index fa1d8d58..60c83535 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 058128a4..ee576780 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -22,7 +22,8 @@ public class ThriftConnection { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich!"); + System.out.println("Keine Verbindung möglich! Satellit="+satAddress); + //System.out.println("Keine Verbindung möglich! Satellit="); return null; } @@ -30,7 +31,8 @@ public class ThriftConnection { final Server.Client client = new Server.Client(protocol); - System.out.println("Verbindung wurde aufgebaut. Satellit="+satAddress); + System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); + //System.out.println("Verbindung wurde aufgebaut."); return client; } diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 88cc19e7..90b1741d 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 5ae5fde0..7b4920bd 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -443,16 +443,16 @@ public class SQL { public boolean deleteImage(Connection con, String id, String version) { - System.out.println("delete image"); + System.out.println("Deleting image..."); try { - + System.out.println("Statement created"); Statement stm = con.createStatement(); - System.out.println("delete image"); + System.out.println("Deleting..."); stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + id + "' " + "AND imageVersion = '" + version + "';"); - + System.out.println("Deleted"); return true; } catch (SQLException e) { -- cgit v1.2.3-55-g7522 From 618d044a5b7ece0b5b9a6810a8de3ec42dab386f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 12:05:08 +0200 Subject: löschen erweitert --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11839 -> 11839 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 097b86aa..057184f4 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 2c4ba5e6..30a12bb2 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -389,8 +389,14 @@ public class DeleteImage_GUI extends JFrame { System.out.println(imageid); System.out.println(imageversion); try { - if (client.deleteImageData(imageid ,imageversion) && - client.deleteImageServer(imageid ,imageversion)) { + + + + if (client.deleteImageData(imageid ,imageversion) == true){ + System.out.println("erstes if true"); + //} + + //if (client.deleteImageData(imageid ,imageversion) && client.deleteImageServer(imageid ,imageversion)) { System.out.println("entrou2"); -- cgit v1.2.3-55-g7522 From 23e63de1e0d6431c2c134879ab8af5786b9cbe64 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 13:33:21 +0200 Subject: neuer verweis --- Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 1967 -> 2038 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10297 -> 10297 bytes Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 20 +++++++++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index f5dd77e7..b3793151 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index b3884c3a..4105eaf0 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index d364ba53..3649d79d 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -343,7 +343,7 @@ public class MainMenue_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Images + // Images if (rdbtnImageNew.isSelected() == true) { CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); sr.setVisible(true); @@ -357,12 +357,14 @@ public class MainMenue_GUI extends JFrame { di.setVisible(true); dispose(); } else if (rdbtnImageSearchDownload.isSelected() == true) { - //SearchMethodLecture_GUI sm = new SearchMethodLecture_GUI(); - //SearchImage_GUI si = new SearchImage_GUI(); - SearchEditImage_GUI si = new SearchEditImage_GUI(); + // SearchMethodLecture_GUI sm = new + // SearchMethodLecture_GUI(); + SearchImage_GUI si = new SearchImage_GUI(); + // SearchEditImage_GUI si = new + // SearchEditImage_GUI(); si.setVisible(true); dispose(); - //Lectures + // Lectures } else if (rdbtnLectureNew.isSelected() == true) { CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); av.setVisible(true); @@ -372,11 +374,11 @@ public class MainMenue_GUI extends JFrame { el.setVisible(true); dispose(); } else if (rdbtnLectureDelete.isSelected() == true) { - //DeleteLecture_GUI dl = new DeleteLecture_GUI(); - //dl.setVisible(true); - //dispose(); + // DeleteLecture_GUI dl = new DeleteLecture_GUI(); + // dl.setVisible(true); + // dispose(); } else if (rdbtnLectureSearch.isSelected() == true) { - //SearchLecture_GUI sl = new SearchLecture_GUI(); + // SearchLecture_GUI sl = new SearchLecture_GUI(); EditLectureSearch_GUI sl = new EditLectureSearch_GUI(); sl.setVisible(true); dispose(); -- cgit v1.2.3-55-g7522 From 83faaa19a0ea1d8622a3e27a250fb6f0a5c5bc5a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 13:33:31 +0200 Subject: b --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11839 -> 11922 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 148 ++-- .../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$getLectureList_call.class | Bin 3039 -> 3039 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3267 -> 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 10117 -> 10449 bytes .../bin/server/Server$AsyncIface.class | Bin 1876 -> 1915 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getLectureList.class | Bin 3132 -> 3132 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3174 -> 3174 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3490 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3702 -> 3812 bytes .../bin/server/Server$Client$Factory.class | Bin 1411 -> 1411 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 18668 -> 19545 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 2108 -> 2147 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$getLectureList.class | Bin 1971 -> 1971 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2060 -> 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 3515 -> 3620 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 3464 -> 3464 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$getLectureList_args$_Fields.class | Bin 2908 -> 2908 bytes ...st_args$getLectureList_argsStandardScheme.class | Bin 2225 -> 2225 bytes ...$getLectureList_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eList_args$getLectureList_argsTupleScheme.class | Bin 1535 -> 1535 bytes ...rgs$getLectureList_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureList_args.class | Bin 7544 -> 7544 bytes .../Server$getLectureList_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureList_resultStandardScheme.class | Bin 3518 -> 3518 bytes ...etLectureList_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...t_result$getLectureList_resultTupleScheme.class | Bin 2905 -> 2905 bytes ...t$getLectureList_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureList_result.class | Bin 10984 -> 10984 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3106 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2827 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2290 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 10797 -> 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/Server.class | Bin 2808 -> 2966 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 13781 -> 13910 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 15538 -> 15457 bytes Dozentenmodulserver/src/server/Server.java | 946 +++++++++++++++++++++ Dozentenmodulserver/src/server/ServerHandler.java | 14 +- Dozentenmodulserver/src/sql/SQL.java | 15 +- Dozentenmodulserver/thrift/server.thrift | 1 + 212 files changed, 1048 insertions(+), 76 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 097b86aa..52e4af38 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 2c4ba5e6..c8363dcc 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -55,6 +55,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import javax.swing.ListSelectionModel; @SuppressWarnings("serial") @@ -294,6 +295,7 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages=new JTable(); + tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tableAllImages.setModel(modelAll); tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -304,6 +306,7 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPaneMyImage = new JScrollPane(); tablemyImages=new JTable(); + tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -321,6 +324,7 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages=new JTable(); + tableCoopImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tableCoopImages.setModel(model); tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -334,6 +338,7 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPanePublicImages = new JScrollPane(); JTable tablePublicImages=new JTable(); + tablePublicImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicImages.setModel(model); tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -347,6 +352,7 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPanePublicVorlagen = new JScrollPane(); JTable tablePublicVorlagen=new JTable(); + tablePublicVorlagen.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicVorlagen.setModel(model); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -365,66 +371,86 @@ public class DeleteImage_GUI extends JFrame { btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //frage, soll das selektierte Daten gelöscht werden? - int eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); - if (eingabe == JOptionPane.YES_OPTION) { - - String imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 7).toString(); - /* modelMyImages.getValueAt( - tablemyImages.convertRowIndexToModel(tablemyImages - .getSelectedRow()), 7).toString(); - */ - - String imageversion = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 8).toString(); - - //TODO - //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. - //Unbdingt abfragen! - - //try { - //if(client.connectedToEvents(imageid ,imageversion)) { - System.out.println(imageid); - System.out.println(imageversion); - try { - if (client.deleteImageData(imageid ,imageversion) && - client.deleteImageServer(imageid ,imageversion)) { - - System.out.println("entrou2"); - - JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - - } else { - - JOptionPane.showConfirmDialog(null, "Löschen hat leider nicht geklappt!!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - - } - } catch (HeadlessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //TODO --> client.deleteImageServer(imageid ,imageversion) - //das file ist aus der DB raus, aber ist noch auf dem Server als Datei hinterlegt. - //dieses muss auch gelöscht werden, um den festplattenlatz wieder frei zu geben. - //Hierzu könnte ein löschbefehl an die kommande zeile des server geschickt werden - //um das entsprechende file zu löschen. identifizieren über den image-namen!! - //z.B. FileUtils.moveFile(tmpFile, new File("141.79.128.102:/srv//openslx/nfs/temp/"+ - //tmpFile.getName())); - //FileUtils.ForceDelete (.. ); - - } - /*} catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } */ - //} + String imageid; + String imageversion; + int eingabe; + + if(tablemyImages.getSelectedRowCount() != 0){ + + //frage, soll das selektierte Daten gelöscht werden? + eingabe = JOptionPane.showConfirmDialog(null, + "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); + + if (eingabe == JOptionPane.YES_OPTION) { + + imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel + (tablemyImages.getSelectedRow()), 7).toString(); + + imageversion = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel + (tablemyImages.getSelectedRow()), 8).toString(); + + //TODO + //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. + //Unbdingt abfragen! + + try { + if(!client.connectedToLecture(imageid ,imageversion)) { + System.out.println(imageid); + System.out.println(imageversion); + try { + if (client.deleteImageData(imageid ,imageversion)) { + if (client.deleteImageServer(imageid ,imageversion)) { + + System.out.println("entrou2"); + + JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", + imageversion, JOptionPane.OK_CANCEL_OPTION); + + } else { + + JOptionPane.showConfirmDialog(null, "Löschen vom Server hat leider nicht geklappt!!", + imageversion, JOptionPane.OK_CANCEL_OPTION); + } + + } else { + + JOptionPane.showConfirmDialog(null, "Löschen von der DB hat leider nicht geklappt!!", + imageversion, JOptionPane.OK_CANCEL_OPTION); + } + } catch (HeadlessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //TODO --> client.deleteImageServer(imageid ,imageversion) + //das file ist aus der DB raus, aber ist noch auf dem Server als Datei hinterlegt. + //dieses muss auch gelöscht werden, um den festplattenlatz wieder frei zu geben. + //Hierzu könnte ein löschbefehl an die kommande zeile des server geschickt werden + //um das entsprechende file zu löschen. identifizieren über den image-namen!! + //z.B. FileUtils.moveFile(tmpFile, new File("141.79.128.102:/srv//openslx/nfs/temp/"+ + //tmpFile.getName())); + //FileUtils.ForceDelete (.. ); + + } + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + /* + DeleteImage_GUI di = new DeleteImage_GUI(); + di.setVisible(true); + dispose(); + */ + + } else { + + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); btnDelete.setBounds(449, 508, 118, 23); @@ -466,7 +492,7 @@ public class DeleteImage_GUI extends JFrame { Image.image.setVersion(imageversion); con.closeThriftConnection(); EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); + ea.setVisible(false); dispose(); } else{ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index fd5ce7e2..9f5d2dfc 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 2763743b..65a0bff5 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 25287e3e..e92f2f0f 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 29bf86f5..35866157 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 1cf0ee02..6414aad7 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 e863e9b3..62982093 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 397fe1d6..b5dbbc3f 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$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class index 8ce82b5a..405188e3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index adb01923..f3dcc4d1 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 43731361..906b2b1a 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 fe911a77..093e1c36 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 e9814f95..9a61224e 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 eb1fc7b3..e59c127c 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 c25152d8..94d9e678 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 fa8e424a..50a176c5 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 c078cc73..cae31aca 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index d14ec43d..836b3047 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index 7229090a..79bc42b1 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index 27c706c6..f7d688e0 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index 1d3459e1..28dd0397 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index 731d42a5..9a6c9668 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index bdf65f60..ea8cd631 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$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class index 34c5598f..3cdaa884 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index a0ff54c0..f335d28d 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index 60de9d8e..47a8149c 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index 85243ff3..9f106295 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index f7d606ae..9c948bb0 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index 98eb4aae..c7543da5 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.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index f8df830c..f6f0c815 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 b8404be7..2d14772c 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$Factory.class b/Dozentenmodulserver/bin/server/Server$Client$Factory.class index 1d51363a..09286b0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client$Factory.class and b/Dozentenmodulserver/bin/server/Server$Client$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index 2b4fdb85..0587e99c 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 46718656..a3d9284a 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 5a646f8e..7bb75cc4 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 1f57a5f6..aef90565 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 0910330a..e0405a73 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 2a4a495b..5e5290e4 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 08ac831a..a4acdd22 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 e8daef72..fea9a738 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 9b0b3af8..be398688 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 c4b7a1a4..50590641 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 fefa042c..5d9cbed0 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 9e4fa7e3..5a19062f 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 6ae23564..af902a77 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 48e55bfc..b1e84f34 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 7421cdf6..a7246446 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 749d2061..d5391935 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 55213daa..fe7d6b60 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 566b9818..22d28b46 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 62b397b0..c75f1fcf 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 846509d5..d516aedd 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$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class index 99641b1d..d8ae61ed 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index cd78e8d8..dedadf46 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 db8c95d0..b6eaf758 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 58db8957..91e86cb0 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 af51678b..da3aff4b 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 f8498b3b..30a7d291 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 dac33bcc..d55b50a3 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 8b364dc8..864b9d5a 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 993fe26f..564c99bc 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 c4061f73..84ed10a9 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 858a9a9e..09b6ba26 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 06657f92..d6b8c42f 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 1db06535..3b90cce7 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 a6ea8244..87c49745 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 e4519d39..591a040f 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 270eb3cc..36ef5071 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 b0e2fb8a..43039335 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 a18cd16c..08f7de61 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 7a207ab3..268ce59e 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 4ccb0f6e..39eef699 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 80fb6048..01a76d6e 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 9032973c..6b0da2e3 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 e49b7735..b4693ef4 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 40b2603a..1cdafaaa 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 16a13224..a6875040 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 9612bc26..59ac6cfe 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 06f10528..6ec7807b 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 2981439c..35af1dc1 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 ff414cb6..23e1f97f 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 f93f65e2..0bb42ebd 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 0d98e82a..d094620c 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 d85b9a32..03381646 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 ee1db82a..78f34b75 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 7c9316a3..6d8348eb 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 5a38ef4e..e83530da 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 efe279c9..9149c286 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 5b0c71d9..7d69bb03 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 eada592e..c07683a3 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 0e2e1164..6fc3042d 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 dbb98d25..ca84bb69 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 a3c32b45..73ac2b82 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 38768f90..71ac2c65 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 cbd473db..6a14cf9f 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 78dfbf2b..06c8fc1f 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 ed7ac762..67a526f5 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 ab640fa4..acfe5bc9 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 a7605f77..eaeb65a3 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 c557fe20..19185ddc 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 de416abf..e0885bb1 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 d3785564..e088efb3 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 40b4b045..3279e6e3 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 5c35e796..1b8a4e89 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 a645c3b5..fb17ea87 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 8f439ef3..2c059581 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 0947c4f3..92dc9992 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 489d777b..0e403681 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 90679d77..41ef1430 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 95e5ece6..9ff26b34 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 a7376a50..7eb2d181 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 f31da3be..0b60c99e 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 1e5729b3..e58c5c6a 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 fd895d17..c9a81bb2 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 cd22da88..71d2a098 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 2f00607f..22eb6856 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 1c8ef9b2..22893ac2 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 24cf518a..91a4a5cc 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 67c4796e..ae6e422f 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 202b0d55..23cd1841 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$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class index cb0661a9..6b4086be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class index ae6edb4d..77d75465 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class index 0af0c78a..3189bcef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class index 057c6059..cf9c91d9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class index 34419387..feed4c11 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class index c2849cfd..3fa53648 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class index b9d0cec4..5f8ffc97 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class index a11d52b1..89a454ce 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class index 6751f22c..9cb13bf1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class index f76c3131..0921f69f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class index ae34c250..f313d3c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class index 1871b56b..c96fd0ef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 16f35a25..b5b8cda2 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 d9fb4b33..3737600e 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 af136829..1ee6395e 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 96fff87c..f754e2cd 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 3f54ea9f..70df3936 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 725e78d3..dc618fe5 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 503bdc9e..61cacaa9 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 bd2e39be..39a548d3 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 be7cad6d..c463454b 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 b58ab01a..e4b9dd2c 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 856ba384..1347866c 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 f9422b07..3a71774d 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 bb5a0a92..cf031f51 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 79a45ecb..01acbf47 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 519cff1e..e46c1fd1 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 46a90302..5f6c9021 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 0dd214ad..0400f893 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 48f5f3e3..d17b1337 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 23ba3af5..74b8757f 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 c7e56eaf..5ab77141 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 278aa60c..414f4397 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 c2b8f390..2aa8f3dd 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 3eeb488e..fa005aa6 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 c0795548..412c0e2a 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 5267f0e1..41033fe6 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 34ab942c..706a6354 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 b8ce335b..842c7441 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 8300f33a..ef8461c6 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 40478d40..5b6f59d6 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 1a18c59c..8ec95ef6 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 fb40238f..614102bc 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 0788936c..b9f47237 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 c64bc0d2..11f1bceb 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 cccad5a0..7a7b86bb 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 c048b951..817cd9af 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 3bb54462..ee6c193a 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 cd134577..c3ff1a07 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 7e0a1b85..2506ceea 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 17f5df79..f93e431b 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 b301fe0f..b760ae8a 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 e1f95e20..8b8094e1 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 4af5eb5c..52a6aad2 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 3dd5edff..2f877127 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 04e442f7..99f4e37b 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 7542d499..4d153ca6 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 6bbaab09..285a3663 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 9dacb917..d160717f 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 dd454126..e682a287 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 298f2dd9..087ca4f8 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 620ddca7..28441c06 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 7dd34c2e..0e08baf2 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 6111aa1d..025ded59 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 efc0a7ab..1f75c0dc 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 b356fab8..e402c774 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 3cda2279..754eb2c3 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 259fa591..734d1463 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 d58d1b22..15dd8fc0 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 01865ad2..e28edff3 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 9e9c6978..392203e9 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 13336037..9d79cb34 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 a3c23aea..532cc30a 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 2bf190ae..06500634 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 b5e9a67b..1fdd03e7 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 d2c8f9c4..fcbfd62c 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 6a854119..186ddf27 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 f37e99b9..36294f30 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 6cb20d7e..6f23abb3 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 172abb2a..7c2e4131 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 6d861c66..0d99ed54 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 b87460dd..4bda1513 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 08ef0070..728b38e4 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 c4d5007c..f4acdc26 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/Server.class b/Dozentenmodulserver/bin/server/Server.class index d1d686ae..573d246d 100644 Binary files a/Dozentenmodulserver/bin/server/Server.class and b/Dozentenmodulserver/bin/server/Server.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 987a85e5..25b491e6 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 4d8392e4..c2957407 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 82124b7b..d1d17435 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -68,6 +68,8 @@ public class Server { public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException; + public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException; + } public interface AsyncIface { @@ -104,6 +106,8 @@ public class Server { public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + } public static class Client extends org.apache.thrift.TServiceClient implements Iface { @@ -539,6 +543,30 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageServer failed: unknown result"); } + public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException + { + send_connectedToLecture(id, version); + return recv_connectedToLecture(); + } + + public void send_connectedToLecture(String id, String version) throws org.apache.thrift.TException + { + connectedToLecture_args args = new connectedToLecture_args(); + args.setId(id); + args.setVersion(version); + sendBase("connectedToLecture", args); + } + + public boolean recv_connectedToLecture() throws org.apache.thrift.TException + { + connectedToLecture_result result = new connectedToLecture_result(); + receiveBase(result, "connectedToLecture"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "connectedToLecture failed: unknown result"); + } + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { @@ -1204,6 +1232,41 @@ public class Server { } } + public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + connectedToLecture_call method_call = new connectedToLecture_call(id, version, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class connectedToLecture_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + private String version; + public connectedToLecture_call(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + this.version = version; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("connectedToLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); + connectedToLecture_args args = new connectedToLecture_args(); + args.setId(id); + args.setVersion(version); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_connectedToLecture(); + } + } + } public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { @@ -1233,6 +1296,7 @@ public class Server { processMap.put("deleteImageData", new deleteImageData()); processMap.put("updateLecturedata", new updateLecturedata()); processMap.put("deleteImageServer", new deleteImageServer()); + processMap.put("connectedToLecture", new connectedToLecture()); return processMap; } @@ -1564,6 +1628,27 @@ public class Server { } } + public static class connectedToLecture extends org.apache.thrift.ProcessFunction { + public connectedToLecture() { + super("connectedToLecture"); + } + + public connectedToLecture_args getEmptyArgsInstance() { + return new connectedToLecture_args(); + } + + protected boolean isOneway() { + return false; + } + + public connectedToLecture_result getResult(I iface, connectedToLecture_args args) throws org.apache.thrift.TException { + connectedToLecture_result result = new connectedToLecture_result(); + result.success = iface.connectedToLecture(args.id, args.version); + result.setSuccessIsSet(true); + return result; + } + } + } public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { @@ -1593,6 +1678,7 @@ public class Server { processMap.put("deleteImageData", new deleteImageData()); processMap.put("updateLecturedata", new updateLecturedata()); processMap.put("deleteImageServer", new deleteImageServer()); + processMap.put("connectedToLecture", new connectedToLecture()); return processMap; } @@ -2420,6 +2506,58 @@ public class Server { } } + public static class connectedToLecture extends org.apache.thrift.AsyncProcessFunction { + public connectedToLecture() { + super("connectedToLecture"); + } + + public connectedToLecture_args getEmptyArgsInstance() { + return new connectedToLecture_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(Boolean o) { + connectedToLecture_result result = new connectedToLecture_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + connectedToLecture_result result = new connectedToLecture_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, connectedToLecture_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.connectedToLecture(args.id, args.version,resultHandler); + } + } + } public static class getFtpUser_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -18492,4 +18630,812 @@ public class Server { } + public static class connectedToLecture_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("connectedToLecture_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new connectedToLecture_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new connectedToLecture_argsTupleSchemeFactory()); + } + + public String id; // required + public String version; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"), + VERSION((short)-2, "version"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + case -2: // VERSION + return VERSION; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(connectedToLecture_args.class, metaDataMap); + } + + public connectedToLecture_args() { + } + + public connectedToLecture_args( + String id, + String version) + { + this(); + this.id = id; + this.version = version; + } + + /** + * Performs a deep copy on other. + */ + public connectedToLecture_args(connectedToLecture_args other) { + if (other.isSetId()) { + this.id = other.id; + } + if (other.isSetVersion()) { + this.version = other.version; + } + } + + public connectedToLecture_args deepCopy() { + return new connectedToLecture_args(this); + } + + @Override + public void clear() { + this.id = null; + this.version = null; + } + + public String getId() { + return this.id; + } + + public connectedToLecture_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public String getVersion() { + return this.version; + } + + public connectedToLecture_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + case VERSION: + return getVersion(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + case VERSION: + return isSetVersion(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof connectedToLecture_args) + return this.equals((connectedToLecture_args)that); + return false; + } + + public boolean equals(connectedToLecture_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(connectedToLecture_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("connectedToLecture_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class connectedToLecture_argsStandardSchemeFactory implements SchemeFactory { + public connectedToLecture_argsStandardScheme getScheme() { + return new connectedToLecture_argsStandardScheme(); + } + } + + private static class connectedToLecture_argsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, connectedToLecture_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, connectedToLecture_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class connectedToLecture_argsTupleSchemeFactory implements SchemeFactory { + public connectedToLecture_argsTupleScheme getScheme() { + return new connectedToLecture_argsTupleScheme(); + } + } + + private static class connectedToLecture_argsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); + } + } + } + + } + + public static class connectedToLecture_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("connectedToLecture_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new connectedToLecture_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new connectedToLecture_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(connectedToLecture_result.class, metaDataMap); + } + + public connectedToLecture_result() { + } + + public connectedToLecture_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on other. + */ + public connectedToLecture_result(connectedToLecture_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public connectedToLecture_result deepCopy() { + return new connectedToLecture_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public connectedToLecture_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof connectedToLecture_result) + return this.equals((connectedToLecture_result)that); + return false; + } + + public boolean equals(connectedToLecture_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(connectedToLecture_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("connectedToLecture_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class connectedToLecture_resultStandardSchemeFactory implements SchemeFactory { + public connectedToLecture_resultStandardScheme getScheme() { + return new connectedToLecture_resultStandardScheme(); + } + } + + private static class connectedToLecture_resultStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, connectedToLecture_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, connectedToLecture_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class connectedToLecture_resultTupleSchemeFactory implements SchemeFactory { + public connectedToLecture_resultTupleScheme getScheme() { + return new connectedToLecture_resultTupleScheme(); + } + } + + private static class connectedToLecture_resultTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, connectedToLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index a67f1e05..8a88a0bf 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -397,12 +397,14 @@ public class ServerHandler implements Server.Iface { return sql.deleteImage(con, id, version); } - - /*@Override - public boolean connectedToEvents(String imageid, String imageversion) + @Override + public boolean connectedToLecture(String id, String version) throws TException { - - return sql.connectedToEvents(con, imageid, imageversion); - }*/ + // TODO Auto-generated method stub + return sql.connectedToLecture(con, id, version); + } + + + } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index a68e20a2..f03e2c84 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -507,22 +507,19 @@ public class SQL { } - public boolean connectedToEvents(Connection con, String id, String version) { + public boolean connectedToLecture(Connection con, String id, String version) { try { Statement stm = con.createStatement(); ResultSet rs = stm - .executeQuery("SELECT ...VERANSTALTUNG_VERKNÜPFUNG... FROM " - + "bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" - + id - + "' " - + "AND imageVersion = '" - + version - + "';"); + .executeQuery("SELECT lectureID FROM " + + "bwLehrpool.m_VLDatalecture where imageID = '" + + id + "' " + "AND imageVersion = '" + + version + "';"); - return !rs.wasNull(); + return rs.first(); } catch (SQLException e) { // TODO Auto-generated catch block diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 36e5e7a1..0e2be7b7 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -49,4 +49,5 @@ service Server{ bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), bool deleteImageServer(string id, string version), + bool connectedToLecture(string id, string version), } \ No newline at end of file -- cgit v1.2.3-55-g7522 From 80f469b40b357729c1e8aea32c71e76349f87d2a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 13:45:56 +0200 Subject: Hauptmenü ruft jetzt korrekte Suchfenster auf --- Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2038 -> 2117 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10297 -> 10297 bytes Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index b3793151..0dd8670b 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index 4105eaf0..ae974664 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 3649d79d..1cf3ea7a 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -378,8 +378,9 @@ public class MainMenue_GUI extends JFrame { // dl.setVisible(true); // dispose(); } else if (rdbtnLectureSearch.isSelected() == true) { - // SearchLecture_GUI sl = new SearchLecture_GUI(); - EditLectureSearch_GUI sl = new EditLectureSearch_GUI(); + SearchLecture_GUI sl = new SearchLecture_GUI(); + // EditLectureSearch_GUI sl = new + // EditLectureSearch_GUI(); sl.setVisible(true); dispose(); } -- cgit v1.2.3-55-g7522 From 419c8fe264c502c0f421f1a4de44bab31e237753 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 13:47:42 +0200 Subject: rtherhert --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11922 -> 11922 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 15 ++++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 63a49753..914e0f8b 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 1f2dbfa6..4f2892e8 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -399,18 +399,23 @@ public class DeleteImage_GUI extends JFrame { System.out.println(imageversion); try { if (client.deleteImageData(imageid ,imageversion)) { - if (client.deleteImageServer(imageid ,imageversion)) { - - System.out.println("entrou2"); + //if (client.deleteImageServer(imageid ,imageversion)) { JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", imageversion, JOptionPane.OK_CANCEL_OPTION); + + /* + * DeleteImage_GUI di = new DeleteImage_GUI(); + * di.setVisible(true); + * dispose(); + */ + - } else { + /*} else { JOptionPane.showConfirmDialog(null, "Löschen vom Server hat leider nicht geklappt!!", imageversion, JOptionPane.OK_CANCEL_OPTION); - } + } */ } else { -- cgit v1.2.3-55-g7522 From 4b0e374a2545b4979b00b68e928dd2b7874f7be9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:08:47 +0200 Subject: vbg --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11922 -> 11922 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 1 - Dozentenmodulserver/bin/sql/SQL.class | Bin 15457 -> 15467 bytes Dozentenmodulserver/src/sql/SQL.java | 4 ++++ 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 914e0f8b..cd0a00e8 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 4f2892e8..9d8c2889 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -187,7 +187,6 @@ public class DeleteImage_GUI extends JFrame { } }}); - textFieldName.setBounds(270, 30, 250, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index c2957407..73b248d0 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index f03e2c84..494f1197 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -455,7 +455,11 @@ public class SQL { stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + id + "' " + "AND imageVersion = '" + version + "';"); + + con.commit(); + System.out.println("Deleted"); + return true; } catch (SQLException e) { -- cgit v1.2.3-55-g7522 From 5ae67976aa7ee4eca866e97bf5c438843e95ff5d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:10:31 +0200 Subject: sdfv --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11922 -> 12030 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2117 -> 2117 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class | Bin 1088 -> 1088 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class | Bin 1006 -> 1006 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class | Bin 977 -> 977 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 1068 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class | Bin 1083 -> 1083 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class | Bin 974 -> 974 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class | Bin 821 -> 821 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10297 -> 10285 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 542 ++++++++++----------- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 1 - .../src/gui/lecture/DeleteLecture_GUI.java | 440 +++++++++++++++++ 14 files changed, 696 insertions(+), 287 deletions(-) create mode 100644 Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 914e0f8b..e09332d7 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index 0dd8670b..eb3e0b32 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class index d88ea420..715b173f 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class 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 index bb811f7a..70e295bc 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class 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 index 1cf17778..361734a3 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class 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 index f33e263d..0971c0ba 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class 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 index 715c30d8..e36a77ac 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class 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 index 10cac7e7..dfc16f23 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class 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 index a42c1174..5aa88af3 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class 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 index 293c16b6..231594c1 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class 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 index ae974664..f0c49faa 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 4f2892e8..fa6e7573 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -1,6 +1,5 @@ package gui.image; - import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; import java.awt.Color; @@ -57,7 +56,6 @@ import server.Server.Client; import thrift.ThriftConnection; import javax.swing.ListSelectionModel; - @SuppressWarnings("serial") public class DeleteImage_GUI extends JFrame { @@ -70,14 +68,17 @@ public class DeleteImage_GUI extends JFrame { JTable tablemyImages; private JTextField textFieldName; JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort","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 ); - + 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. */ @@ -98,35 +99,32 @@ public class DeleteImage_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X + // Beendet die Anwendung nach klick auf X con.closeThriftConnection(); System.exit(0); } }); - //Verhindert das Vergrößern Des Fensters + // Verhindert das Vergrößern Des Fensters setResizable(false); - + try { - //Setzt das Look & Feel auf System + // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); } - //Setzt den Fenstertitel + // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte + // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); - - - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - + final DefaultTableModel model = new DefaultTableModel(titles, 0); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -140,11 +138,12 @@ public class DeleteImage_GUI extends JFrame { panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); } - + JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie + .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -153,148 +152,150 @@ public class DeleteImage_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - + JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 49, 557, 131); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); lblNewLabel_2.setBounds(10, 30, 250, 20); panel_1.add(lblNewLabel_2); - + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); panel_1.add(lblInternetIstInnerhalb); - + textFieldName = new JTextField(); - //Key Listener der Tastatureingabe registriert + // Key Listener der Tastatureingabe registriert textFieldName.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - //Textfield eingabe auslesen - String stext=textFieldName.getText(); - - //Wenn Textfield nicht leer - if(stext!="") - { - //Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); + // Textfield eingabe auslesen + String stext = textFieldName.getText(); + + // Wenn Textfield nicht leer + if (stext != "") { + // Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + } + } + }); textFieldName.setBounds(270, 30, 250, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); + + JLabel lblErweiterteSuche = new JLabel( + "Erweiterte Suche"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI + // Öffnet das Fenster Extended GUI con.closeThriftConnection(); - ExtendedSearchForImages_GUI es=new ExtendedSearchForImages_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 + // 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){ + 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 = new JTable(); tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tableAllImages.setModel(modelAll); tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -303,9 +304,9 @@ public class DeleteImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); - + JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); + tablemyImages = new JTable(); tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -314,16 +315,16 @@ public class DeleteImage_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); tablemyImages.setRowSorter(rowSorterMyImages); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); + JTable tableCoopImages = new JTable(); tableCoopImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tableCoopImages.setModel(model); tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -333,11 +334,12 @@ public class DeleteImage_GUI extends JFrame { tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, + null); tabbedPane.setEnabledAt(2, false); - + JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages=new JTable(); + JTable tablePublicImages = new JTable(); tablePublicImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicImages.setModel(model); tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); @@ -347,12 +349,14 @@ public class DeleteImage_GUI extends JFrame { tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); tabbedPane.setEnabledAt(3, false); - + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable tablePublicVorlagen=new JTable(); - tablePublicVorlagen.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + JTable tablePublicVorlagen = new JTable(); + tablePublicVorlagen + .setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tablePublicVorlagen.setModel(model); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -361,67 +365,81 @@ public class DeleteImage_GUI extends JFrame { tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); tabbedPane.setEnabledAt(4, false); - - - JButton btnDelete = new JButton("L\u00F6schen"); btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - + String imageid; String imageversion; int eingabe; - - if(tablemyImages.getSelectedRowCount() != 0){ - - //frage, soll das selektierte Daten gelöscht werden? + + if (tablemyImages.getSelectedRowCount() != 0) { + + // frage, soll das selektierte Daten gelöscht werden? eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); - - if (eingabe == JOptionPane.YES_OPTION) { - - imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 7).toString(); - - imageversion = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 8).toString(); - - //TODO - //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. - //Unbdingt abfragen! - - try { - if(!client.connectedToLecture(imageid ,imageversion)) { - System.out.println(imageid); - System.out.println(imageversion); - try { - if (client.deleteImageData(imageid ,imageversion)) { - //if (client.deleteImageServer(imageid ,imageversion)) { - - JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - - /* - * DeleteImage_GUI di = new DeleteImage_GUI(); - * di.setVisible(true); - * dispose(); - */ - - - /*} else { - - JOptionPane.showConfirmDialog(null, "Löschen vom Server hat leider nicht geklappt!!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - } */ - - } else { - - JOptionPane.showConfirmDialog(null, "Löschen von der DB hat leider nicht geklappt!!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - } + "Wollen Sie diese Daten löschen?", "Löschen?", + JOptionPane.YES_NO_OPTION); + + if (eingabe == JOptionPane.YES_OPTION) { + + imageid = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages + .getSelectedRow()), 7) + .toString(); + + imageversion = modelMyImages.getValueAt( + tablemyImages + .convertRowIndexToModel(tablemyImages + .getSelectedRow()), 8) + .toString(); + + // TODO + // Image darf nur gelöscht werden, wenn keine + // Veranstaltung mehr auf das Image verweist. + // Unbdingt abfragen! + + try { + if (!client.connectedToLecture(imageid, + imageversion)) { + System.out.println(imageid); + System.out.println(imageversion); + try { + if (client.deleteImageData(imageid, + imageversion)) { + // if (client.deleteImageServer(imageid + // ,imageversion)) { + + /* + * JOptionPane.showConfirmDialog(null, + * "Löschen erfolgreich!", imageversion, + * JOptionPane.OK_CANCEL_OPTION); + */ + DeleteImage_GUI di = new DeleteImage_GUI(); + di.setVisible(true); + dispose(); + /* + * } else { + * + * JOptionPane.showConfirmDialog(null, + * "Löschen vom Server hat leider nicht geklappt!!" + * , imageversion, + * JOptionPane.OK_CANCEL_OPTION); } + */ + + } else { + + JOptionPane + .showConfirmDialog( + null, + "Löschen von der DB hat leider nicht geklappt!!", + imageversion, + JOptionPane.OK_CANCEL_OPTION); + } } catch (HeadlessException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -429,101 +447,39 @@ public class DeleteImage_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - //TODO --> client.deleteImageServer(imageid ,imageversion) - //das file ist aus der DB raus, aber ist noch auf dem Server als Datei hinterlegt. - //dieses muss auch gelöscht werden, um den festplattenlatz wieder frei zu geben. - //Hierzu könnte ein löschbefehl an die kommande zeile des server geschickt werden - //um das entsprechende file zu löschen. identifizieren über den image-namen!! - //z.B. FileUtils.moveFile(tmpFile, new File("141.79.128.102:/srv//openslx/nfs/temp/"+ - //tmpFile.getName())); - //FileUtils.ForceDelete (.. ); - - } + // TODO --> client.deleteImageServer(imageid + // ,imageversion) + // das file ist aus der DB raus, aber ist noch + // auf dem Server als Datei hinterlegt. + // dieses muss auch gelöscht werden, um den + // festplattenlatz wieder frei zu geben. + // Hierzu könnte ein löschbefehl an die kommande + // zeile des server geschickt werden + // um das entsprechende file zu löschen. + // identifizieren über den image-namen!! + // z.B. FileUtils.moveFile(tmpFile, new + // File("141.79.128.102:/srv//openslx/nfs/temp/"+ + // tmpFile.getName())); + // FileUtils.ForceDelete (.. ); + + } } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } } - - /* - DeleteImage_GUI di = new DeleteImage_GUI(); - di.setVisible(true); - dispose(); - */ - + + /* + * DeleteImage_GUI di = new DeleteImage_GUI(); + * di.setVisible(true); dispose(); + */ + } else { - - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - //frage, soll das selektierte Daten gelöscht werden? - eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?",JOptionPane.YES_NO_OPTION); - - if (eingabe == JOptionPane.YES_OPTION) { - - imageid = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 7).toString(); - /* modelMyImages.getValueAt( - tablemyImages.convertRowIndexToModel(tablemyImages - .getSelectedRow()), 7).toString(); - */ - - imageversion = modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel - (tablemyImages.getSelectedRow()), 8).toString(); - - //TODO - //Image darf nur gelöscht werden, wenn keine Veranstaltung mehr auf das Image verweist. - //Unbdingt abfragen! - - //try { - //if(client.connectedToEvents(imageid ,imageversion)) { - System.out.println(imageid); - System.out.println(imageversion); - try { - - - - if (client.deleteImageData(imageid ,imageversion) == true){ - System.out.println("erstes if true"); - //} - - //if (client.deleteImageData(imageid ,imageversion) && client.deleteImageServer(imageid ,imageversion)) { - - System.out.println("entrou2"); - - JOptionPane.showConfirmDialog(null, "Löschen erfolgreich!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - - } else { - - JOptionPane.showConfirmDialog(null, "Löschen hat leider nicht geklappt!!", - imageversion, JOptionPane.OK_CANCEL_OPTION); - - } - } catch (HeadlessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //TODO --> client.deleteImageServer(imageid ,imageversion) - //das file ist aus der DB raus, aber ist noch auf dem Server als Datei hinterlegt. - //dieses muss auch gelöscht werden, um den festplattenlatz wieder frei zu geben. - //Hierzu könnte ein löschbefehl an die kommande zeile des server geschickt werden - //um das entsprechende file zu löschen. identifizieren über den image-namen!! - //z.B. FileUtils.moveFile(tmpFile, new File("141.79.128.102:/srv//openslx/nfs/temp/"+ - //tmpFile.getName())); - //FileUtils.ForceDelete (.. ); - - } - /*} catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } */ - //} + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein eigenes Image aus", + "Message", JOptionPane.INFORMATION_MESSAGE); + } } }); @@ -539,9 +495,9 @@ public class DeleteImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü + // Öffnet das Hauptmenü con.closeThriftConnection(); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); } @@ -555,23 +511,33 @@ public class DeleteImage_GUI extends JFrame { 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(false); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", - JOptionPane.INFORMATION_MESSAGE); + + // 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(false); + dispose(); + } else { + JOptionPane.showMessageDialog(null, + "Bitte wählen Sie ein eigenes Image aus", + "Message", JOptionPane.INFORMATION_MESSAGE); } } }); @@ -579,51 +545,57 @@ public class DeleteImage_GUI extends JFrame { 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){ + + // Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model) { List images; try { - //Hole eine Liste der Images + // Hole eine Liste der Images images = client.getImageList(); - - Iterator i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime(),"",images.get(x).id,images.get(x).getVersion()}; - //System.out.println("id:"+images.get(x).getId()); - //Füge diese Objekte der Tabelle hinzu + + Iterator i = images.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + images.get(x).getUpdateTime(), "", 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 @@ -631,7 +603,5 @@ public class DeleteImage_GUI extends JFrame { } return model; } - - } - +} diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 1cf3ea7a..868f9cd3 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -208,7 +208,6 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureEdit.setBackground(SystemColor.menu); rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); - rdbtnLectureDelete.setEnabled(false); rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); rdbtnLectureDelete.setBounds(6, 76, 175, 23); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java new file mode 100644 index 00000000..adc1ba95 --- /dev/null +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -0,0 +1,440 @@ +package gui.lecture; +import gui.image.*; +import gui.intro.MainMenue_GUI; +import gui.lecture.ExtendedSearchForImages_GUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.HeadlessException; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +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.io.File; +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 org.apache.thrift.TException; +import server.Server.Client; +import thrift.ThriftConnection; +import javax.swing.ListSelectionModel; + + +@SuppressWarnings("serial") +public class DeleteLecture_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 rdbtnLectureNew; + JRadioButton rdbtnImageDelete; + JRadioButton rdbtnLectureEdit; + JRadioButton rdbtnLectureDelete; + JRadioButton rdbtnLectureSearch; + 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(true); + 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"); + 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); + + rdbtnLectureNew = new JRadioButton("Neu"); + buttonGroup.add(rdbtnLectureNew); + rdbtnLectureNew + .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); + rdbtnLectureNew.setBounds(6, 24, 185, 23); + panelVeranstaltung.add(rdbtnLectureNew); + rdbtnLectureNew.setBackground(SystemColor.menu); + + rdbtnLectureEdit = new JRadioButton("Bearbeiten"); + rdbtnLectureEdit + .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); + rdbtnLectureEdit.setBounds(6, 50, 230, 23); + panelVeranstaltung.add(rdbtnLectureEdit); + buttonGroup.add(rdbtnLectureEdit); + rdbtnLectureEdit.setBackground(SystemColor.menu); + + rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); + rdbtnLectureDelete + .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); + rdbtnLectureDelete.setBounds(6, 76, 175, 23); + panelVeranstaltung.add(rdbtnLectureDelete); + buttonGroup.add(rdbtnLectureDelete); + rdbtnLectureDelete.setBackground(SystemColor.menu); + + rdbtnLectureSearch = new JRadioButton("Suche"); + buttonGroup.add(rdbtnLectureSearch); + rdbtnLectureSearch + .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); + rdbtnLectureSearch.setBackground(SystemColor.menu); + rdbtnLectureSearch.setBounds(6, 102, 175, 23); + panelVeranstaltung.add(rdbtnLectureSearch); + + 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); + } + }); + rdbtnLectureNew.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; + txtDesc.setText(descNewLecture); + } + }); + rdbtnLectureEdit.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; + txtDesc.setText(descEditLecture); + } + }); + rdbtnLectureDelete.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + } + }); + rdbtnLectureSearch.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; + txtDesc.setText(descSearchLecture); + } + }); + /* + * 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, 3, 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) { + + // Images + if (rdbtnImageNew.isSelected() == true) { + CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); + sr.setVisible(true); + dispose(); + } else if (rdbtnImageEdit.isSelected() == true) { + SearchEditImage_GUI si = new SearchEditImage_GUI(); + si.setVisible(true); + dispose(); + } else if (rdbtnImageDelete.isSelected() == true) { + DeleteImage_GUI di = new DeleteImage_GUI(); + di.setVisible(true); + dispose(); + } else if (rdbtnImageSearchDownload.isSelected() == true) { + // SearchMethodLecture_GUI sm = new + // SearchMethodLecture_GUI(); + SearchImage_GUI si = new SearchImage_GUI(); + // SearchEditImage_GUI si = new + // SearchEditImage_GUI(); + si.setVisible(true); + dispose(); + // Lectures + } else if (rdbtnLectureNew.isSelected() == true) { + CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); + av.setVisible(true); + dispose(); + } else if (rdbtnLectureEdit.isSelected() == true) { + EditLectureSearch_GUI el = new EditLectureSearch_GUI(); + el.setVisible(true); + dispose(); + } else if (rdbtnLectureDelete.isSelected() == true) { + // DeleteLecture_GUI dl = new DeleteLecture_GUI(); + // dl.setVisible(true); + // dispose(); + } else if (rdbtnLectureSearch.isSelected() == true) { + SearchLecture_GUI sl = new SearchLecture_GUI(); + // EditLectureSearch_GUI sl = new + // EditLectureSearch_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 -- cgit v1.2.3-55-g7522 From e1fe8f87d8b657cfef2af50dea9759e873d34f35 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:19:48 +0200 Subject: neue klasse --- .../src/gui/lecture/DeleteLecture_GUI.java | 567 ++++++++++----------- 1 file changed, 268 insertions(+), 299 deletions(-) diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index adc1ba95..ae370492 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -1,12 +1,10 @@ package gui.lecture; -import gui.image.*; + import gui.intro.MainMenue_GUI; -import gui.lecture.ExtendedSearchForImages_GUI; import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; -import java.awt.HeadlessException; import java.awt.SystemColor; import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -17,18 +15,15 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; 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; @@ -47,77 +42,94 @@ 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 org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; -import javax.swing.ListSelectionModel; - @SuppressWarnings("serial") public class DeleteLecture_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 rdbtnLectureNew; - JRadioButton rdbtnImageDelete; - JRadioButton rdbtnLectureEdit; - JRadioButton rdbtnLectureDelete; - JRadioButton rdbtnLectureSearch; - private final ButtonGroup buttonGroup = new ButtonGroup(); + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JTable tableAllLectures; + JTable tablemyLectures; + JTable tableCoopImages; + JTable tablePublicVorlagen; + JTable tablePublicImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles = { "Veranstaltungsname", "Beschreibung", + "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "Verantwortlicher", "Image", "Schlagwort", "ID" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + final TableRowSorter rowSorterAll = new TableRowSorter( + modelAll); + final TableRowSorter rowSorterMyLectures = new TableRowSorter( + modelMyLectures); + private JButton button; /** * Launch the application. */ public static void main(String[] args) { try { - MainMenue_GUI dialog = new MainMenue_GUI(); - dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setVisible(true); } catch (Exception e) { e.printStackTrace(); } - }// end main + } /** * Create the dialog. */ - public MainMenue_GUI() { + public DeleteLecture_GUI() { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + // Beendet die Anwendung nach klick auf X + con.closeThriftConnection(); System.exit(0); } }); + // Verhindert das Vergrößern Des Fensters + setResizable(false); + try { + // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* "); + // Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung l\u00F6schen"); + // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); - // setBounds(100, 100, 545, 366); + + final DefaultTableModel model = new DefaultTableModel(titles, 0); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 567, 69); + panel.setBounds(10, 11, 577, 57); getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Hauptmen\u00FC"); + JLabel lblNewLabel = new JLabel( + "Zu l\u00F6schende Veranstaltung w\u00E4hlen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -127,301 +139,224 @@ public class DeleteLecture_GUI extends JFrame { txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); txtpnBitteWhlenSie - .setText("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion."); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); + .setText("W\u00E4hlen Sie bitte aus der unten stehenden Liste die zu l\u00F6schende Veranstaltung aus."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } - contentPanel.setBounds(10, 104, 567, 502); + 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 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(true); - 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"); - 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", + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", 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); - - rdbtnLectureNew = new JRadioButton("Neu"); - buttonGroup.add(rdbtnLectureNew); - rdbtnLectureNew - .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnLectureNew.setBounds(6, 24, 185, 23); - panelVeranstaltung.add(rdbtnLectureNew); - rdbtnLectureNew.setBackground(SystemColor.menu); - - rdbtnLectureEdit = new JRadioButton("Bearbeiten"); - rdbtnLectureEdit - .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); - rdbtnLectureEdit.setBounds(6, 50, 230, 23); - panelVeranstaltung.add(rdbtnLectureEdit); - buttonGroup.add(rdbtnLectureEdit); - rdbtnLectureEdit.setBackground(SystemColor.menu); - - rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); - rdbtnLectureDelete - .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnLectureDelete.setBounds(6, 76, 175, 23); - panelVeranstaltung.add(rdbtnLectureDelete); - buttonGroup.add(rdbtnLectureDelete); - rdbtnLectureDelete.setBackground(SystemColor.menu); - - rdbtnLectureSearch = new JRadioButton("Suche"); - buttonGroup.add(rdbtnLectureSearch); - rdbtnLectureSearch - .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnLectureSearch.setBackground(SystemColor.menu); - rdbtnLectureSearch.setBounds(6, 102, 175, 23); - panelVeranstaltung.add(rdbtnLectureSearch); - - 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); - } - }); - rdbtnLectureNew.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; - txtDesc.setText(descNewLecture); + 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)); + + } } }); - rdbtnLectureEdit.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung."; - txtDesc.setText(descEditLecture); + + 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); } }); - rdbtnLectureDelete.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + // Öffnet das Hauptmenü + con.closeThriftConnection(); + DeleteLecture_GUI.this.setVisible(false); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); } }); - rdbtnLectureSearch.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; - txtDesc.setText(descSearchLecture); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 75, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(152, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltungsauswahl"); + lblNewLabel_1.setBounds(166, 11, 128, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + if (tabbedPane.getSelectedIndex() == 0) { + + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + rowSorterMyLectures.setRowFilter(RowFilter.regexFilter( + username, 5)); + } else if (tabbedPane.getSelectedIndex() == 1) { + + } + } }); - /* - * 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, 3, 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); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + initTableModel(modelMyLectures); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllLectures = new JTable(); + tableAllLectures.setModel(modelAll); + tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyLectures = new JTable(); + tablemyLectures.setModel(modelMyLectures); + + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); + tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, + null); + tableAllLectures.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllLectures); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + tableCoopImages = new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Veranstaltungen", null, + scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + tablePublicImages = new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + tablePublicVorlagen = new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + + button = new JButton("L\u00F6schen"); + button.setBounds(459, 508, 118, 23); + contentPanel.add(button); { JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 630, 587, 33); + buttonPane.setBounds(0, 640, 597, 33); buttonPane.setBackground(SystemColor.menu); buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton continueButton = new JButton("Weiter"); - - continueButton.addActionListener(new ActionListener() { + JButton btnBack = new JButton("Zur\u00FCck"); + btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - // Images - if (rdbtnImageNew.isSelected() == true) { - CreateImageAllgemein_GUI sr = new CreateImageAllgemein_GUI(); - sr.setVisible(true); - dispose(); - } else if (rdbtnImageEdit.isSelected() == true) { - SearchEditImage_GUI si = new SearchEditImage_GUI(); - si.setVisible(true); - dispose(); - } else if (rdbtnImageDelete.isSelected() == true) { - DeleteImage_GUI di = new DeleteImage_GUI(); - di.setVisible(true); - dispose(); - } else if (rdbtnImageSearchDownload.isSelected() == true) { - // SearchMethodLecture_GUI sm = new - // SearchMethodLecture_GUI(); - SearchImage_GUI si = new SearchImage_GUI(); - // SearchEditImage_GUI si = new - // SearchEditImage_GUI(); - si.setVisible(true); - dispose(); - // Lectures - } else if (rdbtnLectureNew.isSelected() == true) { - CreateLectureAllgemein_GUI av = new CreateLectureAllgemein_GUI(); - av.setVisible(true); - dispose(); - } else if (rdbtnLectureEdit.isSelected() == true) { - EditLectureSearch_GUI el = new EditLectureSearch_GUI(); - el.setVisible(true); - dispose(); - } else if (rdbtnLectureDelete.isSelected() == true) { - // DeleteLecture_GUI dl = new DeleteLecture_GUI(); - // dl.setVisible(true); - // dispose(); - } else if (rdbtnLectureSearch.isSelected() == true) { - SearchLecture_GUI sl = new SearchLecture_GUI(); - // EditLectureSearch_GUI sl = new - // EditLectureSearch_GUI(); - sl.setVisible(true); - dispose(); - } + // Öffnet das Hauptmenü + con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); + main.setVisible(true); + dispose(); } }); - continueButton.setActionCommand("OK"); - buttonPane.add(continueButton); - getRootPane().setDefaultButton(continueButton); + btnBack.setActionCommand("OK"); + buttonPane.add(btnBack); + getRootPane().setDefaultButton(btnBack); } } - { - 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); - } + + 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); @@ -435,6 +370,40 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mnNewMenu_1.add(mntmOtrs); - }// end main + } -}// end class + // 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; + } +} -- cgit v1.2.3-55-g7522 From 501b16e3bfcacd1b603c07db117fbe43457f033c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:27:55 +0200 Subject: sdfv --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12030 -> 12040 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2117 -> 2247 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10285 -> 10285 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 7 ++++--- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 10 +++------- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index e09332d7..d239ccf2 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index eb3e0b32..97a29d37 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index f0c49faa..0d205dc2 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index fa6e7573..007089cd 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -116,7 +116,7 @@ public class DeleteImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen"); // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; @@ -133,7 +133,8 @@ public class DeleteImage_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); + JLabel lblNewLabel = new JLabel( + "Zu l\u00F6schendes Image w\u00E4hlen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -143,7 +144,7 @@ public class DeleteImage_GUI extends JFrame { 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"); + .setText("W\u00E4hlen Sie bitte aus der unten stehenden Liste das zu l\u00F6schende Image aus."); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 868f9cd3..5e9c85c5 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -359,8 +359,6 @@ public class MainMenue_GUI extends JFrame { // SearchMethodLecture_GUI sm = new // SearchMethodLecture_GUI(); SearchImage_GUI si = new SearchImage_GUI(); - // SearchEditImage_GUI si = new - // SearchEditImage_GUI(); si.setVisible(true); dispose(); // Lectures @@ -373,13 +371,11 @@ public class MainMenue_GUI extends JFrame { el.setVisible(true); dispose(); } else if (rdbtnLectureDelete.isSelected() == true) { - // DeleteLecture_GUI dl = new DeleteLecture_GUI(); - // dl.setVisible(true); - // dispose(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); + dl.setVisible(true); + dispose(); } else if (rdbtnLectureSearch.isSelected() == true) { SearchLecture_GUI sl = new SearchLecture_GUI(); - // EditLectureSearch_GUI sl = new - // EditLectureSearch_GUI(); sl.setVisible(true); dispose(); } -- cgit v1.2.3-55-g7522 From 14c62e39971e6af2fdd87779fa752d3766345b17 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:30:37 +0200 Subject: th --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11878 -> 11878 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 1 + 2 files changed, 1 insertion(+) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 965850c8..bf6b6cbc 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index b8ad2aa0..9a811bc5 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -420,6 +420,7 @@ public class DeleteImage_GUI extends JFrame { * "Löschen erfolgreich!", imageversion, * JOptionPane.OK_CANCEL_OPTION); */ + DeleteImage_GUI di = new DeleteImage_GUI(); di.setVisible(true); dispose(); -- cgit v1.2.3-55-g7522 From 75738c38984474c88c489e951e758e350dd1f61f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:57:14 +0200 Subject: bhh --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11888 -> 11888 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 16 +++++----------- Dozentenmodulserver/bin/sql/SQL.class | Bin 15467 -> 15301 bytes Dozentenmodulserver/src/sql/SQL.java | 10 +--------- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index d07ffc37..8d402e29 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 3e7f494d..1b84d984 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -415,16 +415,15 @@ public class DeleteImage_GUI extends JFrame { imageversion)) { // if (client.deleteImageServer(imageid // ,imageversion)) { - - /* - * JOptionPane.showConfirmDialog(null, - * "Löschen erfolgreich!", imageversion, - * JOptionPane.OK_CANCEL_OPTION); - */ + + con.closeThriftConnection(); + DeleteImage_GUI di = new DeleteImage_GUI(); di.setVisible(true); dispose(); + + /* * } else { * @@ -472,11 +471,6 @@ public class DeleteImage_GUI extends JFrame { } } - /* - * DeleteImage_GUI di = new DeleteImage_GUI(); - * di.setVisible(true); dispose(); - */ - } else { JOptionPane.showMessageDialog(null, diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 73b248d0..f61d58a7 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 494f1197..895c225b 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -443,23 +443,15 @@ public class SQL { public boolean deleteImage(Connection con, String id, String version) { - System.out.println("Deleting image..."); - try { - System.out.println("Statement created"); + Statement stm = con.createStatement(); - System.out.println("Deleting..."); - - System.out.println("delete image22222"); - stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + id + "' " + "AND imageVersion = '" + version + "';"); con.commit(); - System.out.println("Deleted"); - return true; } catch (SQLException e) { -- cgit v1.2.3-55-g7522 From cb097771f43a7cac7b11f998eb81b49fd57e3bc6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 14:59:33 +0200 Subject: sfds --- Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2247 -> 2247 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class | Bin 821 -> 996 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10285 -> 10287 bytes Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 1 + .../src/gui/lecture/DeleteLecture_GUI.java | 8 ++++++++ 6 files changed, 9 insertions(+) diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index 97a29d37..18c77da0 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class index 5aa88af3..352ece48 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class 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 index 231594c1..293c16b6 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class 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 index 0d205dc2..7defc834 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 5e9c85c5..f902ccf9 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -286,6 +286,7 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + txtDesc.setText(descDeleteLecture); } }); rdbtnLectureSearch.addActionListener(new ActionListener() { diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index ae370492..ddca2323 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -325,6 +325,14 @@ public class DeleteLecture_GUI extends JFrame { tabbedPane.setEnabledAt(4, false); button = new JButton("L\u00F6schen"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + String imageid; + String imageversion; + int eingabe; + + } + }); button.setBounds(459, 508, 118, 23); contentPanel.add(button); { -- cgit v1.2.3-55-g7522 From 9f07b91ba397b3dedabe67ae7406c2a888737450 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Apr 2014 15:13:16 +0200 Subject: fff --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11888 -> 11888 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 5 +++++ Dozentenmodulserver/bin/sql/SQL.class | Bin 15301 -> 15324 bytes Dozentenmodulserver/src/sql/SQL.java | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 8d402e29..8f2488bd 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 1b84d984..146ee5c6 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -464,6 +464,11 @@ public class DeleteImage_GUI extends JFrame { // tmpFile.getName())); // FileUtils.ForceDelete (.. ); + } else { + + JOptionPane.showMessageDialog(null, + "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", + "Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE); } } catch (TException e) { // TODO Auto-generated catch block diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index f61d58a7..2f3b1a12 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 895c225b..485d51fd 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -511,8 +511,8 @@ public class SQL { ResultSet rs = stm .executeQuery("SELECT lectureID FROM " - + "bwLehrpool.m_VLDatalecture where imageID = '" - + id + "' " + "AND imageVersion = '" + + "bwLehrpool.m_VLData_lecture WHERE imageID = '" + + id + "' AND imageVersion = '" + version + "';"); return rs.first(); -- cgit v1.2.3-55-g7522 From a3c0327dbd49efc29ede542f7093638941a7ae13 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Apr 2014 10:48:10 +0200 Subject: Debugging: Jeder Fehler poppt auf in einem Textfenster und kann analysiert werden --- Dozentenmodul/bin/ftp/FTPUtility.class | Bin 5211 -> 5521 bytes .../bin/gui/image/CreateImageAllgemein_GUI$2.class | Bin 847 -> 847 bytes .../bin/gui/image/CreateImageAllgemein_GUI$3.class | Bin 1166 -> 1166 bytes .../bin/gui/image/CreateImageAllgemein_GUI$4.class | Bin 1656 -> 1656 bytes .../bin/gui/image/CreateImageAllgemein_GUI.class | Bin 7817 -> 8273 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 11888 -> 12396 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9131 -> 9583 bytes .../bin/gui/image/FTPCreateUploader_GUI$1.class | Bin 792 -> 792 bytes .../bin/gui/image/FTPCreateUploader_GUI$2.class | Bin 1313 -> 1786 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$5.class | Bin 813 -> 813 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 1707 -> 2040 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 1652 -> 2125 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1014 -> 1014 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12329 -> 12776 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1414 -> 1887 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 1303 -> 1303 bytes .../bin/gui/image/FTPDownloader_GUI$3.class | Bin 1167 -> 1167 bytes .../bin/gui/image/FTPDownloader_GUI$4.class | Bin 785 -> 785 bytes .../bin/gui/image/FTPDownloader_GUI$5.class | Bin 1557 -> 2030 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 972 -> 972 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 10017 -> 10352 bytes .../bin/gui/image/FTPEditUploader_GUI$6.class | Bin 1503 -> 1836 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 11887 -> 12276 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 1094 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 951 bytes .../bin/gui/image/SearchEditImage_GUI$6.class | Bin 1637 -> 1637 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2177 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 11762 -> 12270 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 1066 -> 1066 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 1273 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 927 -> 927 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 1274 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 914 -> 914 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1613 -> 1613 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1917 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 956 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 11552 -> 12060 bytes .../bin/gui/intro/BillOfRights_GUI$1.class | Bin 710 -> 710 bytes .../bin/gui/intro/BillOfRights_GUI$2.class | Bin 1836 -> 2231 bytes .../bin/gui/intro/BillOfRights_GUI$3.class | Bin 959 -> 959 bytes Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class | Bin 10827 -> 10827 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1106 -> 1194 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9009 -> 9413 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class | Bin 692 -> 692 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2247 -> 2247 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class | Bin 1088 -> 1088 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class | Bin 1006 -> 1006 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class | Bin 977 -> 977 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 1068 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class | Bin 1083 -> 1083 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class | Bin 974 -> 974 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class | Bin 996 -> 996 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10287 -> 10545 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class | Bin 695 -> 695 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class | Bin 1156 -> 1629 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class | Bin 1797 -> 2192 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class | Bin 827 -> 827 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 5311 -> 5311 bytes .../bin/thrift/MasterThriftConnection.class | Bin 1647 -> 2125 bytes .../SessionData$SessionDataStandardScheme.class | Bin 2843 -> 2843 bytes ...sionData$SessionDataStandardSchemeFactory.class | Bin 965 -> 965 bytes .../SessionData$SessionDataTupleScheme.class | Bin 2290 -> 2290 bytes ...SessionData$SessionDataTupleSchemeFactory.class | Bin 941 -> 941 bytes Dozentenmodul/bin/thrift/SessionData$_Fields.class | Bin 3030 -> 3030 bytes Dozentenmodul/bin/thrift/SessionData.class | Bin 11687 -> 12076 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 1960 -> 2326 bytes Dozentenmodul/src/ftp/FTPUtility.java | 5 + Dozentenmodul/src/ftp/UploadTask.java | 2 +- .../src/gui/image/CreateImageAllgemein_GUI.java | 3 + Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 26 +- .../src/gui/image/EditImageAllgemein_GUI.java | 3 + .../src/gui/image/FTPCreateUploader_GUI.java | 19 + Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 11 +- .../src/gui/image/FTPEditUploader_GUI.java | 14 +- .../src/gui/image/SearchEditImage_GUI.java | 14 +- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 14 +- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 7 + Dozentenmodul/src/gui/intro/Login_GUI.java | 16 + Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 4 +- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 10 + .../src/gui/lecture/CreateLectureLink_GUI.java | 10 +- .../src/gui/lecture/DeleteLecture_GUI.java | 41 +- .../src/thrift/MasterThriftConnection.java | 9 +- Dozentenmodul/src/thrift/SessionData.java | 9 + Dozentenmodul/src/thrift/ThriftConnection.java | 9 +- .../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$getLectureList_call.class | Bin 3039 -> 3039 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3267 -> 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 10449 -> 10747 bytes .../bin/server/Server$AsyncIface.class | Bin 1915 -> 1949 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getLectureList.class | Bin 3132 -> 3132 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3174 -> 3174 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3490 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3812 -> 3912 bytes .../bin/server/Server$Client$Factory.class | Bin 1411 -> 1411 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 19545 -> 20326 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 2147 -> 2181 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$getLectureList.class | Bin 1971 -> 1971 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2060 -> 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 3620 -> 3715 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 3464 -> 3464 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$getLectureList_args$_Fields.class | Bin 2908 -> 2908 bytes ...st_args$getLectureList_argsStandardScheme.class | Bin 2225 -> 2225 bytes ...$getLectureList_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eList_args$getLectureList_argsTupleScheme.class | Bin 1535 -> 1535 bytes ...rgs$getLectureList_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureList_args.class | Bin 7544 -> 7544 bytes .../Server$getLectureList_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureList_resultStandardScheme.class | Bin 3518 -> 3518 bytes ...etLectureList_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...t_result$getLectureList_resultTupleScheme.class | Bin 2905 -> 2905 bytes ...t$getLectureList_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureList_result.class | Bin 10984 -> 10984 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3106 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2827 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2290 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 10797 -> 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/Server.class | Bin 2966 -> 3104 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 13910 -> 14058 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 15324 -> 15633 bytes Dozentenmodulserver/src/server/Server.java | 842 +++++++++++++++++++++ Dozentenmodulserver/src/server/ServerHandler.java | 7 +- Dozentenmodulserver/src/sql/SQL.java | 37 +- Dozentenmodulserver/thrift/server.thrift | 1 + 302 files changed, 1062 insertions(+), 51 deletions(-) diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class index e0536990..8484d422 100644 Binary files a/Dozentenmodul/bin/ftp/FTPUtility.class and b/Dozentenmodul/bin/ftp/FTPUtility.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class index be29eec5..35392672 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class index 07b78998..de93b267 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class index b001474a..be1e5801 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class index 60d254b9..0e5865b9 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 8f2488bd..e429fcd8 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index 75dbaaf3..071850c3 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class index 3eded544..34ef1b8c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class index aac75f6d..983bbab7 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 4adde720..20f615b4 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class index 03aeea73..e0fabcc6 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class index 7ffa5033..da0d973c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index 720ce3cd..0d982996 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class index 496f2158..65c67d65 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index 29269bbd..79c3a835 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index e933f11b..495ab5ca 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class index 3be2f5f1..1b6ed7d5 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class 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 index 217b987a..57505d9b 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class 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 index 0b7106e2..53ce9bf1 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class 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 index 9b5b4107..d72b7fd9 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class index 847b6416..a86cfda4 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class index cb5888ae..4ef7cd96 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index b93f9f90..d9f847f2 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class index 8d99419a..563e41cb 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class 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 index 4a557c2e..bd2d50f5 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class index 56f4b278..89997bb5 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class 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 index 7b7a41f8..fae1e33c 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class 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 index 0715d19e..87bf6d5f 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class index 3bbfbad4..f8cd9839 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class 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 index 14b127f6..35e33e48 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index 7d66e216..d058454e 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class 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 index 8ca7d2fa..5713f420 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class 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 index 18f964fe..a0172be7 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class 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 index 2aff1b68..ab7702e4 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class 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 index 8c3cee86..c868afe6 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class 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 index 5d5e2cfd..92fcc494 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class 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 index 7e564db6..f8d904d8 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class 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 index 3e0a8637..5e1dc507 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class 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 index c01be42e..46fdf45d 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class 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 index 4161ee8a..1e1dc0f3 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index 8568b3b2..39a39cf6 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class 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 index 6a2f53f1..70661228 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class 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 index 16bbf49f..a69337f6 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class 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 index a3ae5059..0d4bafa7 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class 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 index 9d951522..84ebd55c 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class 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 index b06e1848..64948d28 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class 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 index beaa50e5..570e91d4 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 75e8282e..6db87dc2 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index ea041701..29560f9a 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class 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 index a6abdea4..2891e710 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class 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 index 18c77da0..bd12ec95 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class index 715b173f..c964162e 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class 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 index 70e295bc..f2dd265c 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class 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 index 361734a3..3ba22ff0 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class 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 index 0971c0ba..c867b9d2 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class 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 index e36a77ac..e4239a4e 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class 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 index dfc16f23..fa189dbb 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class 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 index 352ece48..843f828c 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class 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 index 293c16b6..a373ce86 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class 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 index 7defc834..c035deed 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class 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 index 60fcb543..39963963 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class 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 index a61250c1..3f17b0d6 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class 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 index bfa90045..c9b6e28a 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class 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 index 056f8f8d..3485b280 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class 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 index e74b203f..2cd12110 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class index fd712cf8..9b587dd3 100644 Binary files a/Dozentenmodul/bin/thrift/MasterThriftConnection.class and b/Dozentenmodul/bin/thrift/MasterThriftConnection.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class index 9b8c9ed9..06cd5a25 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class and b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class index 132cbe65..d41ac16a 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class and b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class index eaa4e9a6..f17400c1 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class and b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class index 0abd2b91..f4f8424d 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class and b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$_Fields.class b/Dozentenmodul/bin/thrift/SessionData$_Fields.class index 8a9df0f6..56fd12f4 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData$_Fields.class and b/Dozentenmodul/bin/thrift/SessionData$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData.class b/Dozentenmodul/bin/thrift/SessionData.class index f084b247..c1156dff 100644 Binary files a/Dozentenmodul/bin/thrift/SessionData.class and b/Dozentenmodul/bin/thrift/SessionData.class differ diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index 60c83535..40003a69 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index 7824440a..b4543349 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -7,6 +7,8 @@ import java.io.OutputStream; import java.net.SocketException; import java.security.NoSuchAlgorithmException; +import javax.swing.JOptionPane; + import models.Image; import org.apache.commons.net.ftp.FTP; @@ -224,6 +226,9 @@ public class FTPUtility { } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 67706169..788acad6 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -69,7 +69,7 @@ public class UploadTask extends SwingWorker { util.finish(); } catch (FTPException ex) { JOptionPane.showMessageDialog(null, "Error uploading file: " + ex.getMessage(), - "Error", JOptionPane.ERROR_MESSAGE); + "Error", JOptionPane.ERROR_MESSAGE); ex.printStackTrace(); setProgress(0); cancel(true); diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 63483e3d..f3b4d732 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -73,6 +73,9 @@ public class CreateImageAllgemein_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } //Setzt den Titel setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 146ee5c6..66dfc344 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -17,7 +17,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.File; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -47,9 +46,7 @@ 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 org.apache.commons.io.FileUtils; import org.apache.thrift.TException; import server.Server.Client; @@ -224,6 +221,9 @@ public class DeleteImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { @@ -375,8 +375,8 @@ public class DeleteImage_GUI extends JFrame { btnDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - String imageid; - String imageversion; + String imageid=""; + String imageversion=""; int eingabe; if (tablemyImages.getSelectedRowCount() != 0) { @@ -439,15 +439,21 @@ public class DeleteImage_GUI extends JFrame { .showConfirmDialog( null, "Löschen von der DB hat leider nicht geklappt!!", - imageversion, - JOptionPane.OK_CANCEL_OPTION); + "Fehler", + JOptionPane.INFORMATION_MESSAGE); } } catch (HeadlessException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // TODO --> client.deleteImageServer(imageid // ,imageversion) @@ -473,6 +479,9 @@ public class DeleteImage_GUI extends JFrame { } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } @@ -564,6 +573,9 @@ public class DeleteImage_GUI extends JFrame { } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index e5dc45c7..949aeed6 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -335,6 +335,9 @@ public class EditImageAllgemein_GUI extends JFrame { } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 1777e27d..7e6b42a0 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -24,6 +24,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JSeparator; @@ -103,6 +104,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -117,6 +121,9 @@ public class FTPCreateUploader_GUI extends JFrame implements | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // filename=name; @@ -299,6 +306,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -341,6 +351,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -386,6 +399,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); @@ -485,6 +501,9 @@ public class FTPCreateUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; } return true; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 9c6b2892..ec92396b 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -10,6 +10,7 @@ import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingConstants; @@ -45,7 +46,6 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - //String host = "141.79.128.121"; String host = "141.79.128.102"; int port = 21; String downloadFile = ""; @@ -81,6 +81,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -290,6 +293,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } thrift.closeThriftConnection(); @@ -333,6 +339,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task = new DownloadTask(host, port, user.userName, user.password, diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index b1415ef9..e0c0b6c4 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -24,6 +24,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JSeparator; @@ -49,7 +50,6 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; String host = "141.79.128.102"; int port = 21; server.User user; @@ -293,6 +293,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -337,6 +340,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } task.cancel(true); } @@ -381,6 +387,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); Image.image.setNewName(formatter.format(new Date()) + "_" @@ -467,6 +476,9 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return false; } return true; diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index d5c48764..7c35bf00 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -76,14 +76,6 @@ public class SearchEditImage_GUI extends JFrame { 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. @@ -220,6 +212,9 @@ public class SearchEditImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { @@ -511,6 +506,9 @@ public class SearchEditImage_GUI extends JFrame { } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index bb1e8aa7..4e6e7046 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -76,14 +76,6 @@ public class SearchImage_GUI extends JFrame { 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. @@ -220,6 +212,9 @@ public class SearchImage_GUI extends JFrame { } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); + JOptionPane.showMessageDialog(null, + e2.getCause()+"\n"+e2.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { @@ -466,6 +461,9 @@ public class SearchImage_GUI extends JFrame { } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } return model; } diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index e4f37871..988a8b38 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -20,6 +20,7 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSeparator; @@ -129,9 +130,15 @@ public class BillOfRights_GUI extends JFrame { } catch (InvalidFileFormatException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } VmWareLink_GUI ac=new VmWareLink_GUI(); ac.setVisible(true); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index aa28b3b6..0efbe3cb 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -69,6 +69,9 @@ public class Login_GUI extends JFrame { } catch (Exception e) { e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getStackTrace(), + "Message", JOptionPane.ERROR_MESSAGE); } } }); @@ -94,6 +97,9 @@ public class Login_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen setTitle("Dozentenmodul *Prototyp*"); @@ -260,6 +266,9 @@ public class Login_GUI extends JFrame { } catch (IOException | TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } else { @@ -284,10 +293,17 @@ public class Login_GUI extends JFrame { "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Message", JOptionPane.ERROR_MESSAGE); return; } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return; } }// end performLogin diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index f902ccf9..4817e786 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -33,6 +33,8 @@ import java.awt.ScrollPane; import javax.swing.JTextArea; import javax.swing.ImageIcon; +import models.SessionData; + @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -81,7 +83,7 @@ public class MainMenue_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* "); + setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress()); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 722) / 2; int left = (screenSize.width - 603) / 2; diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 2f578e8b..1c0a51c0 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -8,6 +8,7 @@ import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; import javax.swing.JDialog; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -123,6 +124,9 @@ public class VmWareLink_GUI extends JFrame { } catch (URISyntaxException | IOException e) { // TODO Auto-generated catch block e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } @@ -143,9 +147,15 @@ public class VmWareLink_GUI extends JFrame { } catch (InvalidFileFormatException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } } } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 11d3131e..9da0400d 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -206,9 +206,12 @@ public class CreateLectureLink_GUI extends JFrame { for (int i = 0; i < list.size(); i++) { comboBox.addItem(list.get(i)); } - } catch (TException e2) { + } catch (TException e) { // TODO Auto-generated catch block - e2.printStackTrace(); + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -410,6 +413,9 @@ public class CreateLectureLink_GUI extends JFrame { "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, + e1.getCause()+"\n"+e1.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); } con.closeThriftConnection(); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index ddca2323..57d36515 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -24,6 +24,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; @@ -327,9 +328,45 @@ public class DeleteLecture_GUI extends JFrame { button = new JButton("L\u00F6schen"); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String imageid; - String imageversion; + String lectureID=""; int eingabe; + + //check if a row is selected + if (tablemyLectures.getSelectedRowCount() !=0){ + //a row is selected + //ask for confirmation + eingabe = JOptionPane.showConfirmDialog(null, + "Wollen Sie diese Daten löschen?", "Löschen?", + JOptionPane.YES_NO_OPTION); + + if (eingabe == JOptionPane.YES_OPTION) { + //user has confirmed deletion, now get the ID of the selected lecture + lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); + System.out.println("Lösche Lecture "+lectureID); + try { + if(client.deleteLecture(lectureID)){ + System.out.println("Löschen erfolgreich"); + //delete successful + con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); + dl.setVisible(true); + dispose(); + } else { + //delete not successful + JOptionPane + .showMessageDialog( + null, + "Löschen aus Datenbank fehlgeschlagen.", + "Fehler", + JOptionPane.INFORMATION_MESSAGE); + } + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + }//end delete + }//end ask for confirmation + + }//end check if a row is selected } }); diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index 7ddbd1a5..24d034f2 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -1,5 +1,7 @@ package thrift; +import javax.swing.JOptionPane; + import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; @@ -22,14 +24,15 @@ public class MasterThriftConnection { transport.open(); } catch (TTransportException e) { System.out.println("Keine Verbindung möglich!"); + JOptionPane.showMessageDialog(null, + e.getCause()+"\n"+e.getMessage(), + "Debug-Message", JOptionPane.ERROR_MESSAGE); return null; } final TProtocol protocol = new TBinaryProtocol(transport); final Client client = new Client(protocol); - - - System.out.println("\nDer Server läuft!"); + System.out.println("Masterserver erreichbar."); return client; } diff --git a/Dozentenmodul/src/thrift/SessionData.java b/Dozentenmodul/src/thrift/SessionData.java index 51f0f80b..f754ecb3 100644 --- a/Dozentenmodul/src/thrift/SessionData.java +++ b/Dozentenmodul/src/thrift/SessionData.java @@ -29,6 +29,9 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; + +import javax.swing.JOptionPane; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -442,6 +445,9 @@ public class SessionData implements org.apache.thrift.TBase { @@ -1267,6 +1294,38 @@ public class Server { } } + public void deleteLecture(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + deleteLecture_call method_call = new deleteLecture_call(id, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall { + private String id; + public deleteLecture_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + super(client, protocolFactory, transport, resultHandler, false); + this.id = id; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); + deleteLecture_args args = new deleteLecture_args(); + args.setId(id); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_deleteLecture(); + } + } + } public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { @@ -1297,6 +1356,7 @@ public class Server { processMap.put("updateLecturedata", new updateLecturedata()); processMap.put("deleteImageServer", new deleteImageServer()); processMap.put("connectedToLecture", new connectedToLecture()); + processMap.put("deleteLecture", new deleteLecture()); return processMap; } @@ -1649,6 +1709,27 @@ public class Server { } } + public static class deleteLecture extends org.apache.thrift.ProcessFunction { + public deleteLecture() { + super("deleteLecture"); + } + + public deleteLecture_args getEmptyArgsInstance() { + return new deleteLecture_args(); + } + + protected boolean isOneway() { + return false; + } + + public deleteLecture_result getResult(I iface, deleteLecture_args args) throws org.apache.thrift.TException { + deleteLecture_result result = new deleteLecture_result(); + result.success = iface.deleteLecture(args.id); + result.setSuccessIsSet(true); + return result; + } + } + } public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { @@ -1679,6 +1760,7 @@ public class Server { processMap.put("updateLecturedata", new updateLecturedata()); processMap.put("deleteImageServer", new deleteImageServer()); processMap.put("connectedToLecture", new connectedToLecture()); + processMap.put("deleteLecture", new deleteLecture()); return processMap; } @@ -2558,6 +2640,58 @@ public class Server { } } + public static class deleteLecture extends org.apache.thrift.AsyncProcessFunction { + public deleteLecture() { + super("deleteLecture"); + } + + public deleteLecture_args getEmptyArgsInstance() { + return new deleteLecture_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(Boolean o) { + deleteLecture_result result = new deleteLecture_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + deleteLecture_result result = new deleteLecture_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.deleteLecture(args.id,resultHandler); + } + } + } public static class getFtpUser_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { @@ -19438,4 +19572,712 @@ public class Server { } + public static class deleteLecture_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("deleteLecture_args"); + + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteLecture_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteLecture_argsTupleSchemeFactory()); + } + + public String id; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + ID((short)-1, "id"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case -1: // ID + return ID; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_args.class, metaDataMap); + } + + public deleteLecture_args() { + } + + public deleteLecture_args( + String id) + { + this(); + this.id = id; + } + + /** + * Performs a deep copy on other. + */ + public deleteLecture_args(deleteLecture_args other) { + if (other.isSetId()) { + this.id = other.id; + } + } + + public deleteLecture_args deepCopy() { + return new deleteLecture_args(this); + } + + @Override + public void clear() { + this.id = null; + } + + public String getId() { + return this.id; + } + + public deleteLecture_args setId(String id) { + this.id = id; + return this; + } + + public void unsetId() { + this.id = null; + } + + /** Returns true if field id is set (has been assigned a value) and false otherwise */ + public boolean isSetId() { + return this.id != null; + } + + public void setIdIsSet(boolean value) { + if (!value) { + this.id = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case ID: + if (value == null) { + unsetId(); + } else { + setId((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case ID: + return getId(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case ID: + return isSetId(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteLecture_args) + return this.equals((deleteLecture_args)that); + return false; + } + + public boolean equals(deleteLecture_args that) { + if (that == null) + return false; + + boolean this_present_id = true && this.isSetId(); + boolean that_present_id = true && that.isSetId(); + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (!this.id.equals(that.id)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteLecture_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteLecture_args("); + boolean first = true; + + sb.append("id:"); + if (this.id == null) { + sb.append("null"); + } else { + sb.append(this.id); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteLecture_argsStandardSchemeFactory implements SchemeFactory { + public deleteLecture_argsStandardScheme getScheme() { + return new deleteLecture_argsStandardScheme(); + } + } + + private static class deleteLecture_argsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case -1: // ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteLecture_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.id != null) { + oprot.writeFieldBegin(ID_FIELD_DESC); + oprot.writeString(struct.id); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteLecture_argsTupleSchemeFactory implements SchemeFactory { + public deleteLecture_argsTupleScheme getScheme() { + return new deleteLecture_argsTupleScheme(); + } + } + + private static class deleteLecture_argsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetId()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetId()) { + oprot.writeString(struct.id); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.id = iprot.readString(); + struct.setIdIsSet(true); + } + } + } + + } + + public static class deleteLecture_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteLecture_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new deleteLecture_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new deleteLecture_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_result.class, metaDataMap); + } + + public deleteLecture_result() { + } + + public deleteLecture_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on other. + */ + public deleteLecture_result(deleteLecture_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public deleteLecture_result deepCopy() { + return new deleteLecture_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public deleteLecture_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteLecture_result) + return this.equals((deleteLecture_result)that); + return false; + } + + public boolean equals(deleteLecture_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(deleteLecture_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("deleteLecture_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class deleteLecture_resultStandardSchemeFactory implements SchemeFactory { + public deleteLecture_resultStandardScheme getScheme() { + return new deleteLecture_resultStandardScheme(); + } + } + + private static class deleteLecture_resultStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, deleteLecture_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class deleteLecture_resultTupleSchemeFactory implements SchemeFactory { + public deleteLecture_resultTupleScheme getScheme() { + return new deleteLecture_resultTupleScheme(); + } + } + + private static class deleteLecture_resultTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 8a88a0bf..48013b3d 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -375,7 +375,8 @@ public class ServerHandler implements Server.Iface { * * File noch iniziieren */ - //File tmpFile=new File("141.79.128.102:/srv/openslx/nfs/temp/"); + // Pfad der Datei aus der DB auslesen und hier eintragen + //File tmpFile=new File("127.0.0.1:/srv/openslx/nfs/temp/"); File tmpFile = null; try { @@ -403,6 +404,10 @@ public class ServerHandler implements Server.Iface { // TODO Auto-generated method stub return sql.connectedToLecture(con, id, version); } + + public boolean deleteLecture(String id){ + return sql.deleteLecture(con, id); + } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 485d51fd..5c5b0ec6 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -3,15 +3,11 @@ package sql; import java.sql.*; import java.text.DateFormat; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; - import org.apache.log4j.Logger; - import server.BinaryListener; -import server.ServerHandler; public class SQL { @@ -444,14 +440,14 @@ public class SQL { public boolean deleteImage(Connection con, String id, String version) { try { - - Statement stm = con.createStatement(); + + Statement stm = con.createStatement(); stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + id + "' " + "AND imageVersion = '" + version + "';"); - + con.commit(); - + return true; } catch (SQLException e) { @@ -509,11 +505,9 @@ public class SQL { Statement stm = con.createStatement(); - ResultSet rs = stm - .executeQuery("SELECT lectureID FROM " - + "bwLehrpool.m_VLData_lecture WHERE imageID = '" - + id + "' AND imageVersion = '" - + version + "';"); + ResultSet rs = stm.executeQuery("SELECT lectureID FROM " + + "bwLehrpool.m_VLData_lecture WHERE imageID = '" + id + + "' AND imageVersion = '" + version + "';"); return rs.first(); @@ -525,4 +519,21 @@ public class SQL { return false; } + + public boolean deleteLecture(Connection con, String id) { + + try { + Statement stm = con.createStatement(); + stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"+ id + "';"); + + con.commit(); + + return true; + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return false; + } } diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 0e2be7b7..6bb328fe 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -50,4 +50,5 @@ service Server{ bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), bool deleteImageServer(string id, string version), bool connectedToLecture(string id, string version), + bool deleteLecture(string id), } \ No newline at end of file -- cgit v1.2.3-55-g7522