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/src/thrift/MasterThriftConnection.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Dozentenmodul/src/thrift/MasterThriftConnection.java') 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 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(-) (limited to 'Dozentenmodul/src/thrift/MasterThriftConnection.java') 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