From 62e2f1b6e031753d9af83adb65683a6bdd5673e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Apr 2014 16:09:11 +0200 Subject: Untersuche das Update von Images, Name wird nicht korrekt übermittelt und Version nicht hochgezählt --- Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 1 + 1 file changed, 1 insertion(+) (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index e0c0b6c4..8d14458a 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -468,6 +468,7 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean updateData() { try { + System.out.println("NewName="+Image.image.getNewName()); client.updateImageData(Image.image.getImagename(), Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), -- cgit v1.2.3-55-g7522 From f8479ea377b8a0baae5146dbe4af8933adc9cb74 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 13:13:25 +0200 Subject: Problem beim bearbeiten eines Image behoben. DB pk's auf UUID umgestellt --- Dozentenmodul/bin/Models/Image.class | Bin 1979 -> 2176 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12324 -> 12438 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 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 10551 -> 10551 bytes Dozentenmodul/bin/models/Image.class | Bin 1979 -> 2176 bytes Dozentenmodul/src/Models/Image.java | 8 + .../src/gui/image/EditImageAllgemein_GUI.java | 2 +- .../src/gui/image/FTPEditUploader_GUI.java | 6 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 3 + Dozentenmodul/src/models/Image.java | 8 + .../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 -> 3971 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4508 -> 4508 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4339 -> 4339 bytes .../bin/server/Server$AsyncClient.class | Bin 11231 -> 11292 bytes .../bin/server/Server$AsyncIface.class | Bin 2090 -> 2108 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 -> 3412 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3688 -> 3688 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3530 -> 3530 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3912 -> 3912 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 20725 -> 20834 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 2277 -> 2295 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 -> 2324 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2603 -> 2603 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2430 -> 2430 bytes .../bin/server/Server$Processor.class | Bin 3715 -> 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 -> 3679 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 4130 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3454 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 19726 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 4135 -> 4135 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 5038 -> 5038 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4206 -> 4206 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 25807 -> 25807 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 3996 -> 3996 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4813 -> 4813 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 4036 -> 4036 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 24513 -> 24513 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 14741 -> 14948 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 17876 -> 18003 bytes Dozentenmodulserver/src/server/Server.java | 198 ++++++++++++++++----- Dozentenmodulserver/src/server/ServerHandler.java | 16 +- Dozentenmodulserver/src/sql/SQL.java | 46 ++--- Dozentenmodulserver/thrift/server.thrift | 2 +- 220 files changed, 210 insertions(+), 79 deletions(-) (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class index 4c70ef81..92835598 100644 Binary files a/Dozentenmodul/bin/Models/Image.class and b/Dozentenmodul/bin/Models/Image.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 8a8771d9..5f49649b 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/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 780e5fd1..0f948630 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class index 6ecad17e..37d3827f 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 6ff76a07..50bac1aa 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 73bacfd2..e45c4bb5 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/models/Image.class b/Dozentenmodul/bin/models/Image.class index 4c70ef81..92835598 100644 Binary files a/Dozentenmodul/bin/models/Image.class and b/Dozentenmodul/bin/models/Image.class differ diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index cdc8264c..33a9a558 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -6,6 +6,7 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; @@ -13,6 +14,13 @@ public class Image { public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 0c50cc2b..da3a29e4 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -283,7 +283,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { // setze Namen, egal ob alt oder nicht - Image.image.setNewName(imagename.getText()); + Image.image.setImagename(imagename.getText()); System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); con.closeThriftConnection(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 8d14458a..ebeec090 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -392,10 +392,11 @@ public class FTPEditUploader_GUI extends JFrame implements "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); + + Image.image.getImagename()+ ".vmdk"); task = new UploadTask(host, port, user.userName, user.password, user.path, uploadFile); @@ -469,8 +470,9 @@ public class FTPEditUploader_GUI extends JFrame implements try { System.out.println("NewName="+Image.image.getNewName()); + System.out.println("OldName="+Image.image.getImagename()); client.updateImageData(Image.image.getImagename(), - Image.image.getNewName(), Image.image.isLicensed(), + Image.image.getImagename(),"/srv/openslx/nfs/temp/" + Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), Image.image.getVersion()); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 019a2ec7..3d882da0 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.util.UUID; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -89,6 +91,7 @@ public class Login_GUI extends JFrame { // Fenster darf nicht vergrößert werden setResizable(false); + try { // Setzt das Look and Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index cdc8264c..33a9a558 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -6,6 +6,7 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; @@ -13,6 +14,13 @@ public class Image { public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 99096196..2a703edb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index 3b5b8668..58b8e2a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 163327ae..a00ad055 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 16e030a5..0b92f799 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 1a845e78..d55d1e7b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index 5ae1d472..6e35a446 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index ceba873e..94b45f21 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class index 74627ae1..1582e9cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index 0be04673..d775783a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 3001a150..ffdbbb75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 3c51c321..490d4b24 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index e7cd737a..aa0ee7f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index 1cb6760d..45b79054 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 2e5b048d..b1cd5368 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 41cbbca6..f603e376 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index 6c6287fb..1046d036 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 7c95b3bb..1e153a8e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index 89773d07..2158cc02 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index 2c388ded..5ad37c7a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index a8c3bbb0..82b35bd0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index b5bb26ef..5f228647 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 6a04fe4d..917aa711 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class index 417280c4..c5dc6a1e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index c53fb59b..70f7c93d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index 5466d4f3..bc394167 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index b7a6d45b..78d4e3a4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index d014f3c5..4fdb102b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index e3b0ee41..c32910b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index 1e2046d1..abbece84 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index f1ecd262..41ee8a64 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index f9fd387f..2fcaf9de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index d5b7e725..d5eff44a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index 121d6e06..20abf97b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index 338099bb..de602e7c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index 556eaf30..89c7e1a8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 27d37445..6bc97bee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index 931447a4..5ad75395 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index cf9dbfe6..b768c50c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index 2cd9e584..95ac9ed7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index cdc8aad4..a661e9be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 11b43a51..e152687f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index cb92fd55..c9b8cc91 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index e018e4fe..157e733b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index eb28aad2..05f32cf6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index 2de7e60c..21cd4f4f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index eabd6d26..97cbbb30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index 9977b3e0..8f67dcad 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index 5de255e4..165dd64f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index 7fb5e299..5d3308ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 9a02fded..e84c352c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class index 4dabdb80..fc399367 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index a82e786f..d3d036d7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 5ef9d012..0541fe06 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index 03413b9a..34bfeaa8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 246fd460..347ed304 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 1aab45dc..7299950c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index f052d73d..ba689b32 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 04396dea..63857ba9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 6ca6c959..7b73215e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index 015e3694..71beedac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 7160425d..2967849f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index 4f4cb1eb..f955ce30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index f6f53a12..481b2e69 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index dfbf7280..f231eb08 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index 27ede07c..612e5846 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index ed239233..9d677339 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index 02aca422..2966b923 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 66a755ea..8ac5fcf2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index 1cd12bbc..d8ff2753 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index c3e63a81..2c63b67b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 08687831..87b0b5ec 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index 6900c11e..e3b48cd7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 8471e19a..adfc2c30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 489cc2b7..f2f46ae9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index c06b81df..902bb6be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index 460a21e0..1d9c8217 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 053801c2..570ab02a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index 2a3d4b4b..fdc90d9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index d62afc67..d3af2796 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index b040ec2c..0c8a55e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index 13f727c9..76531e78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 33f444a5..e0012e4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index 7c2651d8..41f876e0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index ce0f3afd..e9888d78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index d4c51a89..4328b3b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index 679ca840..8004f48d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index f9fd719e..a8ffb349 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index acd4f68d..89c1cd31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 725ba93e..8b94a1eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index d2be770f..a45896a3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index ea9e81dc..763dc6de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 503b38a7..e1279055 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 12802094..a638196a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index 99bd6b42..3c27e25e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index 4f74e5a9..a6778b56 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index 995c212e..4bfe9bf9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index ca102252..aae2c6e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index 57733f9b..cad9e80a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index e8e3fd64..2f34f5f5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 696a0c69..c435826b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index 9bfc6713..468055a6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index 383d1fdb..b1c81ab2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index 842b546c..040f5805 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index 82ca4144..9d8abb2c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index c8e0203b..eac7a5ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index 40d8375d..bdf465d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index 1f7fed6c..8c4cef93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 52b5adcb..844c3838 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 8c156360..5d964cfc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index 20746edc..5275b211 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index 0e35f900..a60340a0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index 283e84cd..9303ce43 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index c70bebcc..f7ffe53a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index 72570ea8..87d62265 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index fd3565f8..805db647 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index 03b03af9..e1522627 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index e9b03e3b..493431ea 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index b27b8c75..b5caedc5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class index 80f3c989..eae1e659 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class index 6672fbdd..f04dd22b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class index 070d47f4..32644d1e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class index cf3ad2d9..74a58705 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class index 315c18a6..50501fcb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class index 6a618405..8f1eb819 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class index d9c8edb8..1c5ac786 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class index c37fd524..2f089288 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class index 23208b4c..2164815f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class index 66fe7fd0..962cebc4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class index 45f0b58e..220efabe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class index ddbe752a..ba7a6967 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 4a964b37..ca866ea1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 463066e5..c7a2df7e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index 42324db3..92ccbfa8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index db7602b0..e18cc5c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 8b7cbc74..c77ab14c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 2fe81853..a695a70f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index 059cd427..b739853c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 26a9d75f..5b305be9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index 13198090..3643ff97 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index 7fa62de2..70979f44 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index 0927dae5..12bccee8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index 62e6eb80..7a56c3f6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index 50ca18bc..e0bef61e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 6843971d..8ed69de7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index a8c2ba60..ee4cdb1b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 3eaf85d0..e42fb9fe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index ef66f43e..902aa8b0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index 7248d646..b99b4f5c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index 1f3ad1e6..32ed417d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index 6664b81b..bf970859 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index 5cd6c0f6..28dc0e7f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 8b57c223..0c436cea 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index 0e0bd95b..e2ddb42e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index de399737..56b63f61 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index 2af962df..d655069e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index fca74504..c72853f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index fcc238e6..5ecee434 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index 857d17e9..cc8950c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 469b541c..4d38cc49 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index b57174c7..de2f21d6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index 3d4edda7..a8f9d489 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index af154f67..a4b99264 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index dc63fd6e..6692c8c9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index da2111f7..139107e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index d66f5e51..ffa23c73 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index e85aa979..ba28b230 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index c52c9653..66732eac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 8c63e132..641b311c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index bf239b0c..3dd15b3f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index 43f786ca..15ba4550 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 376f2267..7cdf9b67 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index a074025e..b8b39ace 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index b3a524e8..fcdbec6a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index e7aee83f..97f6cd44 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 139fab7b..20b0949c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 21bbe1a1..9833f07d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index 03b49731..7899684d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index 14733b7b..ffa75918 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index 2ceee0bb..716a0d4e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index 99694335..13884360 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index f1cec65b..bfbc15f7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index 51342fbb..e2d1ab15 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index be96de33..423e51e4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index ce5881df..3be543ee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index 16da1ff6..d8606602 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 25fa5593..4dfe8b54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index 33fdab9f..d0b3667a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index 9af08681..266bf38f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index 275d7e49..3413a2d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index e67720c5..c76b1bf7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 6b6a7b29..c047df49 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index 1dd2998a..4c3be70d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index 350a5a96..8d48c65a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index 221e201d..136dda20 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index 7651e4ca..dc021e2e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index d1761095..c7d00f54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 105a236a..e8a5625a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index 54dee1c0..5a855000 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index d51dabd5..8261a71d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 0123218b..d31781c7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 9b02f185..4205cfdc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index 5f22aaab..7b6a378e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index a04b90b8..a0493c4c 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index ba53f127..602532c8 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 91afb099..7382e965 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -58,7 +58,7 @@ public class Server { public Map getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; public Map getLectureData(String lecturename) throws org.apache.thrift.TException; @@ -98,7 +98,7 @@ public class Server { public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -411,17 +411,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException { - send_updateImageData(name, newName, license, internet, ram, cpu, id, version); + send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); @@ -1040,9 +1041,9 @@ public class Server { } } - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1050,16 +1051,18 @@ public class Server { public static class updateImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String newName; + private String image_path; private boolean license; private boolean internet; private long ram; private long cpu; private String id; private String version; - public updateImageData_call(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; this.internet = internet; this.ram = ram; @@ -1073,6 +1076,7 @@ public class Server { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); @@ -1615,7 +1619,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version); + result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version); result.setSuccessIsSet(true); return result; } @@ -2393,7 +2397,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); + iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); } } @@ -13115,12 +13119,13 @@ public class Server { private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-3); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-4); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-5); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-6); - 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)-7); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-4); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-5); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-6); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-7); + 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)-8); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -13130,6 +13135,7 @@ public class Server { public String name; // required public String newName; // required + public String image_path; // required public boolean license; // required public boolean internet; // required public long ram; // required @@ -13141,12 +13147,13 @@ public class Server { public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)-1, "name"), NEW_NAME((short)-2, "newName"), - LICENSE((short)-3, "license"), - INTERNET((short)-4, "internet"), - RAM((short)-5, "ram"), - CPU((short)-6, "cpu"), - ID((short)-7, "id"), - VERSION((short)-8, "version"); + IMAGE_PATH((short)-3, "image_path"), + LICENSE((short)-4, "license"), + INTERNET((short)-5, "internet"), + RAM((short)-6, "ram"), + CPU((short)-7, "cpu"), + ID((short)-8, "id"), + VERSION((short)-9, "version"); private static final Map byName = new HashMap(); @@ -13165,17 +13172,19 @@ public class Server { return NAME; case -2: // NEW_NAME return NEW_NAME; - case -3: // LICENSE + case -3: // IMAGE_PATH + return IMAGE_PATH; + case -4: // LICENSE return LICENSE; - case -4: // INTERNET + case -5: // INTERNET return INTERNET; - case -5: // RAM + case -6: // RAM return RAM; - case -6: // CPU + case -7: // CPU return CPU; - case -7: // ID + case -8: // ID return ID; - case -8: // VERSION + case -9: // VERSION return VERSION; default: return null; @@ -13229,6 +13238,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NEW_NAME, new org.apache.thrift.meta_data.FieldMetaData("newName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("image_path", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LICENSE, new org.apache.thrift.meta_data.FieldMetaData("license", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.INTERNET, new org.apache.thrift.meta_data.FieldMetaData("internet", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -13251,6 +13262,7 @@ public class Server { public updateImageData_args( String name, String newName, + String image_path, boolean license, boolean internet, long ram, @@ -13261,6 +13273,7 @@ public class Server { this(); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; setLicenseIsSet(true); this.internet = internet; @@ -13284,6 +13297,9 @@ public class Server { if (other.isSetNewName()) { this.newName = other.newName; } + if (other.isSetImage_path()) { + this.image_path = other.image_path; + } this.license = other.license; this.internet = other.internet; this.ram = other.ram; @@ -13304,6 +13320,7 @@ public class Server { public void clear() { this.name = null; this.newName = null; + this.image_path = null; setLicenseIsSet(false); this.license = false; setInternetIsSet(false); @@ -13364,6 +13381,30 @@ public class Server { } } + public String getImage_path() { + return this.image_path; + } + + public updateImageData_args setImage_path(String image_path) { + this.image_path = image_path; + return this; + } + + public void unsetImage_path() { + this.image_path = null; + } + + /** Returns true if field image_path is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_path() { + return this.image_path != null; + } + + public void setImage_pathIsSet(boolean value) { + if (!value) { + this.image_path = null; + } + } + public boolean isLicense() { return this.license; } @@ -13522,6 +13563,14 @@ public class Server { } break; + case IMAGE_PATH: + if (value == null) { + unsetImage_path(); + } else { + setImage_path((String)value); + } + break; + case LICENSE: if (value == null) { unsetLicense(); @@ -13581,6 +13630,9 @@ public class Server { case NEW_NAME: return getNewName(); + case IMAGE_PATH: + return getImage_path(); + case LICENSE: return Boolean.valueOf(isLicense()); @@ -13614,6 +13666,8 @@ public class Server { return isSetName(); case NEW_NAME: return isSetNewName(); + case IMAGE_PATH: + return isSetImage_path(); case LICENSE: return isSetLicense(); case INTERNET: @@ -13661,6 +13715,15 @@ public class Server { return false; } + boolean this_present_image_path = true && this.isSetImage_path(); + boolean that_present_image_path = true && that.isSetImage_path(); + if (this_present_image_path || that_present_image_path) { + if (!(this_present_image_path && that_present_image_path)) + return false; + if (!this.image_path.equals(that.image_path)) + return false; + } + boolean this_present_license = true; boolean that_present_license = true; if (this_present_license || that_present_license) { @@ -13751,6 +13814,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetImage_path()).compareTo(other.isSetImage_path()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImage_path()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_path, other.image_path); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetLicense()).compareTo(other.isSetLicense()); if (lastComparison != 0) { return lastComparison; @@ -13847,6 +13920,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("image_path:"); + if (this.image_path == null) { + sb.append("null"); + } else { + sb.append(this.image_path); + } + first = false; + if (!first) sb.append(", "); sb.append("license:"); sb.append(this.license); first = false; @@ -13939,7 +14020,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LICENSE + case -3: // IMAGE_PATH + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -4: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -13947,7 +14036,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // INTERNET + case -5: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -13955,7 +14044,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // RAM + case -6: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -13963,7 +14052,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // CPU + case -7: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -13971,7 +14060,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // ID + case -8: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -13979,7 +14068,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // VERSION + case -9: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -14024,6 +14113,11 @@ public class Server { oprot.writeFieldBegin(LICENSE_FIELD_DESC); oprot.writeBool(struct.license); oprot.writeFieldEnd(); + if (struct.image_path != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.image_path); + oprot.writeFieldEnd(); + } if (struct.newName != null) { oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); oprot.writeString(struct.newName); @@ -14058,31 +14152,37 @@ public class Server { if (struct.isSetNewName()) { optionals.set(1); } - if (struct.isSetLicense()) { + if (struct.isSetImage_path()) { optionals.set(2); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(3); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(4); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(5); } - if (struct.isSetId()) { + if (struct.isSetCpu()) { optionals.set(6); } - if (struct.isSetVersion()) { + if (struct.isSetId()) { optionals.set(7); } - oprot.writeBitSet(optionals, 8); + if (struct.isSetVersion()) { + optionals.set(8); + } + oprot.writeBitSet(optionals, 9); if (struct.isSetName()) { oprot.writeString(struct.name); } if (struct.isSetNewName()) { oprot.writeString(struct.newName); } + if (struct.isSetImage_path()) { + oprot.writeString(struct.image_path); + } if (struct.isSetLicense()) { oprot.writeBool(struct.license); } @@ -14106,7 +14206,7 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(8); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -14116,26 +14216,30 @@ public class Server { struct.setNewNameIsSet(true); } if (incoming.get(2)) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } + if (incoming.get(3)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.version = iprot.readString(); struct.setVersionIsSet(true); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 7c93422f..67514c39 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -87,9 +87,9 @@ public class ServerHandler implements Server.Iface { String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws TException { - int pk_institution = sql.setInstitution(con, university); + String pk_institution = sql.setInstitution(con, university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); sql.setImageData(con, pk_person, license, internet, cpu, ram, @@ -177,18 +177,18 @@ public class ServerHandler implements Server.Iface { String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws TException { - int pk_image = 0; + String pk_image = null; int imageversion = 0; - int pk_institution = sql.setInstitution(con, university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_institution = sql.setInstitution(con, university); + String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); ResultSet image = sql.getImageIDandVersion(con, imagename); try { while (image.next()) { - pk_image = image.getInt("GUID_imageID"); + pk_image = image.getString("GUID_imageID"); imageversion = image.getInt("imageVersion"); } } catch (SQLException e) { @@ -282,10 +282,10 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean updateImageData(String name, String newName, + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws TException { - sql.UpdateImageData(con, name, newName, license, internet, cpu, ram, + sql.UpdateImageData(con, name, newName,image_path, license, internet, cpu, ram, id, version); return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 52cbefb9..a5eeb83e 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -6,6 +6,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; +import java.util.UUID; + import org.apache.log4j.Logger; import server.BinaryListener; @@ -114,7 +116,7 @@ public class SQL { return null; } - public int setInstitution(Connection con, String university) { + public String setInstitution(Connection con, String university) { try { Statement stm = con.createStatement(); @@ -122,8 +124,8 @@ public class SQL { .executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'" + university + "';"); if (ret.next() == false) { - Random rand = new Random(); - int id = rand.nextInt(); + + String id = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('" + id + "','" + university + "');"); con.commit(); @@ -131,9 +133,9 @@ public class SQL { .executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '" + university + "';"); rs.next(); - return rs.getInt("institutionID"); + return rs.getString("institutionID"); } else { - return ret.getInt("institutionID"); + return ret.getString("institutionID"); } } catch (SQLException e) { @@ -141,11 +143,11 @@ public class SQL { log.info(new Date() + " - Failed to setInstitution."); e.printStackTrace(); } - return -1; + return "-1"; } - public int setPerson(Connection con, String login, String lastname, - String firstname, String mail, Date lastlogin, int Institution) { + public String setPerson(Connection con, String login, String lastname, + String firstname, String mail, Date lastlogin, String Institution) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); try { Statement stm = con.createStatement(); @@ -156,9 +158,10 @@ public class SQL { + "' and Vorname like '" + firstname + "';"); + if (ret.next() == false) { - Random rand = new Random(); - int id = rand.nextInt(); + + String id = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('" + id + "','" @@ -182,9 +185,10 @@ public class SQL { + firstname + "';"); rs.next(); - return rs.getInt("userID"); + return rs.getString("userID"); } else { - return ret.getInt("userID"); + ret.first(); + return ret.getString("userID"); } } catch (SQLException e) { @@ -192,10 +196,10 @@ public class SQL { log.info(new Date() + " - Failed to setPerson."); e.printStackTrace(); } - return -1; + return "-1"; } - public boolean setImageData(Connection con, int pk_person, boolean license, + public boolean setImageData(Connection con, String pk_person, boolean license, boolean internet, long cpu, long ram, String imagename, String imagePath) { @@ -212,8 +216,8 @@ public class SQL { try { Statement stm = con.createStatement(); - Random random = new Random(); - int uid = random.nextInt(); + + String uid = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('" + uid // GUID_imageID + "',1,'" // imageVersion @@ -316,7 +320,7 @@ public class SQL { return null; } - public int setLectureData(Connection con, int pk_person, int pk_image, + public int setLectureData(Connection con, String pk_person, String pk_image, int imageversion, String name, String desc, String shortdesc, String start, String end, boolean isactive) { @@ -328,8 +332,8 @@ public class SQL { } try { Statement stm = con.createStatement(); - Random random = new Random(); - int uid = random.nextInt(); + + String uid = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('" + uid + "','" @@ -398,7 +402,7 @@ public class SQL { return null; } - public int UpdateImageData(Connection con, String name, String newName, + public int UpdateImageData(Connection con, String name, String newName,String image_path, boolean license, boolean internet, long cpu, long ram, String id, String version) { try { @@ -420,6 +424,8 @@ public class SQL { + newVersion + "',`image_name` = '" + newName + + "',`image_path` = '" + + image_path + "',`image_update_time` = '" + formatter.format(new Date()) + "',`rec_change_time` = '" diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 662ec004..088ea8fb 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -44,7 +44,7 @@ service Server{ bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), bool startFileCopy(string file), map getImageData(string imageid, string imageversion), - bool updateImageData(string name, string newName,bool license, bool internet, int ram,int cpu, string id, string version), + bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version), map getLectureData(string lecturename), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), -- cgit v1.2.3-55-g7522 From c6b8f14dd17839b78c753999f2f73b7dfdc8d745 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 12:46:57 +0200 Subject: -Kopieren von Temp zu Prod inkl. änderung des Pfades in SQL-DB -Dateigröße zur DB hinzugefügt --- Dozentenmodul/bin/Models/Image.class | Bin 2176 -> 2387 bytes Dozentenmodul/bin/ftp/FTPUtility.class | Bin 5521 -> 4632 bytes Dozentenmodul/bin/ftp/UploadTask.class | Bin 3378 -> 3474 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 2128 -> 2125 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 2125 -> 1014 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1014 -> 0 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12804 -> 12730 bytes .../bin/gui/image/FTPEditUploader_GUI$1.class | Bin 782 -> 782 bytes .../bin/gui/image/FTPEditUploader_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$4.class | Bin 1186 -> 1186 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI$6.class | Bin 1836 -> 2114 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12438 -> 12349 bytes Dozentenmodul/bin/models/Image.class | Bin 2176 -> 2387 bytes Dozentenmodul/src/Models/Image.java | 8 + Dozentenmodul/src/ftp/FTPUtility.java | 40 +- Dozentenmodul/src/ftp/UploadTask.java | 3 + .../src/gui/image/FTPCreateUploader_GUI.java | 31 +- .../src/gui/image/FTPEditUploader_GUI.java | 25 +- Dozentenmodul/src/models/Image.java | 8 + Dozentenmodulserver/.classpath | 1 + .../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 3971 -> 4149 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4508 -> 4508 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4339 -> 4517 bytes .../bin/server/Server$AsyncClient.class | Bin 11292 -> 11372 bytes .../bin/server/Server$AsyncIface.class | Bin 2108 -> 2112 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 3412 -> 3466 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3688 -> 3688 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3530 -> 3584 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3912 -> 3912 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 20834 -> 21075 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 2295 -> 2299 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 2324 -> 2378 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2603 -> 2603 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2430 -> 2484 bytes .../bin/server/Server$Processor.class | Bin 3715 -> 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 3679 -> 3860 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 4130 -> 4475 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3454 -> 3778 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 19726 -> 22186 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 4135 -> 4135 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 5038 -> 5038 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4206 -> 4206 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 25807 -> 25807 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 3996 -> 4177 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4813 -> 5158 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 4036 -> 4360 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 24513 -> 26967 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 14869 -> 15199 bytes Dozentenmodulserver/bin/server/startServer.class | Bin 2057 -> 2884 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 18096 -> 18887 bytes Dozentenmodulserver/bin/util/XMLCreator.class | Bin 7428 -> 7557 bytes Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar | Bin 0 -> 101592 bytes Dozentenmodulserver/src/models/Configuration.java | 39 ++ Dozentenmodulserver/src/server/BinaryListener.java | 2 +- Dozentenmodulserver/src/server/Server.java | 448 +++++++++++++++++++-- Dozentenmodulserver/src/server/ServerHandler.java | 31 +- Dozentenmodulserver/src/server/startServer.java | 21 + Dozentenmodulserver/src/sql/SQL.java | 39 +- Dozentenmodulserver/src/util/XMLCreator.java | 4 +- Dozentenmodulserver/thrift/server.thrift | 4 +- 237 files changed, 568 insertions(+), 136 deletions(-) delete mode 100644 Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class create mode 100644 Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar create mode 100644 Dozentenmodulserver/src/models/Configuration.java (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class index 92835598..59b34fab 100644 Binary files a/Dozentenmodul/bin/Models/Image.class and b/Dozentenmodul/bin/Models/Image.class differ diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class index 8484d422..95655233 100644 Binary files a/Dozentenmodul/bin/ftp/FTPUtility.class and b/Dozentenmodul/bin/ftp/FTPUtility.class differ diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class index 32bd6720..2b62ba67 100644 Binary files a/Dozentenmodul/bin/ftp/UploadTask.class and b/Dozentenmodul/bin/ftp/UploadTask.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index 7cf9cff2..8c258693 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 be81b8f2..e1337eb4 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 deleted file mode 100644 index ac3c1459..00000000 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 3844526a..d188a795 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/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class index a25d7157..5df62ad7 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class index 55d72ee9..4a933e6e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 23f71ee1..b790203f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class index dfb69143..44bbface 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index 87c0067c..cadf961a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class index 563e41cb..9977588b 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 5f49649b..2d0dc8a7 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/models/Image.class b/Dozentenmodul/bin/models/Image.class index 92835598..59b34fab 100644 Binary files a/Dozentenmodul/bin/models/Image.class and b/Dozentenmodul/bin/models/Image.class differ diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index 33a9a558..0b3c936e 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -11,6 +11,7 @@ public class Image { private boolean internet; private int ram; private int cpu; + private long filesize; public static Image image =new Image(); @@ -69,4 +70,11 @@ public class Image { public void setVersion(String version) { this.version = version; } + public long getFilesize() { + return filesize; + } + public void setFilesize(long filesize) { + this.filesize = filesize; + } + } diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index b4543349..f2c51dfc 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -196,44 +196,6 @@ public class FTPUtility { return outputStream; } - public String[] getAllRohling(String SearchString) throws SocketException - { - //FTPClient ftp=new FTPClient(); - - String[] filenamelist; - - - try { - - - ftpClient.changeWorkingDirectory("/home/openslx/images"); - filenamelist=ftpClient.listNames(); - - String[] search=new String[filenamelist.length]; - for(int i=0;i { long totalBytesRead = 0; int percentCompleted = 0; long fileSize = uploadFile.length(); + Image.image.setFilesize(fileSize); long start=System.nanoTime(); final double NANOS_PER_SECOND = 1000000000.0; final double BYTES_PER_MIB = 1024*1024; diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 5ebc5766..2b432c96 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -295,28 +295,6 @@ public class FTPCreateUploader_GUI extends JFrame implements separator_1.setBounds(0, 627, 597, 2); contentPanel.add(separator_1); - JButton btnCopyFileTo = new JButton("Copy File to Prod"); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - System.out.println("Copying file to " + user.path + "/" - + uploadFile.getName()); - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - System.out.println("Failed to copy to: " + user.path + "/" - + uploadFile.getName()); - e1.printStackTrace(); - JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - } - }); - btnCopyFileTo.setBounds(102, 375, 173, 23); - contentPanel.add(btnCopyFileTo); - JLabel lblSchritt_1 = new JLabel("Schritt 1:"); lblSchritt_1.setBounds(24, 128, 57, 14); contentPanel.add(lblSchritt_1); @@ -416,7 +394,7 @@ public class FTPCreateUploader_GUI extends JFrame implements + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename() + ".vmdk"); task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); + user.path+"temp/", uploadFile); task.addPropertyChangeListener(this); task.execute(); @@ -442,8 +420,10 @@ public class FTPCreateUploader_GUI extends JFrame implements // Fertigstellen erlauben wenn upload abgeschlossen if (progress == 100) { finishButton.setEnabled(true); + } else { finishButton.setEnabled(false); + } } @@ -489,7 +469,7 @@ public class FTPCreateUploader_GUI extends JFrame implements public boolean writeData() { try { - + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getUsername(), person.verantwortlicher.getVorname(), @@ -500,7 +480,8 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), - "/srv/openslx/nfs/temp/" + Image.image.getNewName()); + "temp/" + Image.image.getNewName(),false,Image.image.getFilesize()); + client.startFileCopy(Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index ebeec090..639ca554 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -71,7 +71,6 @@ public class FTPEditUploader_GUI extends JFrame implements Client client = thrift.getThriftConnection(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); - JButton btnCopyFileTo = new JButton("Copy File to Prod"); JButton finishButton = new JButton("Fertigstellen"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -285,23 +284,6 @@ public class FTPEditUploader_GUI extends JFrame implements separator_1.setBounds(0, 627, 597, 2); contentPanel.add(separator_1); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - } - }); - btnCopyFileTo.setBounds(102, 375, 173, 23); - contentPanel.add(btnCopyFileTo); - JLabel lblSchritt_1 = new JLabel("Schritt 1:"); lblSchritt_1.setBounds(24, 128, 57, 14); contentPanel.add(lblSchritt_1); @@ -398,7 +380,7 @@ public class FTPEditUploader_GUI extends JFrame implements + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename()+ ".vmdk"); task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); + user.path+"temp/", uploadFile); task.addPropertyChangeListener(this); task.execute(); @@ -472,10 +454,11 @@ public class FTPEditUploader_GUI extends JFrame implements System.out.println("NewName="+Image.image.getNewName()); System.out.println("OldName="+Image.image.getImagename()); client.updateImageData(Image.image.getImagename(), - Image.image.getImagename(),"/srv/openslx/nfs/temp/" + Image.image.getNewName(), Image.image.isLicensed(), + Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), - Image.image.getVersion()); + Image.image.getVersion(), false,Image.image.getFilesize()); + client.startFileCopy(Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index 33a9a558..0b3c936e 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -11,6 +11,7 @@ public class Image { private boolean internet; private int ram; private int cpu; + private long filesize; public static Image image =new Image(); @@ -69,4 +70,11 @@ public class Image { public void setVersion(String version) { this.version = version; } + public long getFilesize() { + return filesize; + } + public void setFilesize(long filesize) { + this.filesize = filesize; + } + } diff --git a/Dozentenmodulserver/.classpath b/Dozentenmodulserver/.classpath index a5e7594d..a4c7b889 100644 --- a/Dozentenmodulserver/.classpath +++ b/Dozentenmodulserver/.classpath @@ -7,5 +7,6 @@ + diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 2a703edb..5a2f6467 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index 58b8e2a2..1fa17d1b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index a00ad055..6160ac92 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 0b92f799..09a58749 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index d55d1e7b..18262b01 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index 6e35a446..7ea4ae26 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index 94b45f21..079b5cc7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class index 1582e9cf..a43e1d44 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index d775783a..e12e6ef7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index ffdbbb75..0d2560a4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 490d4b24..9dbdc9f6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index aa0ee7f2..ac6c5c48 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index 45b79054..72130419 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index b1cd5368..a23e2786 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index f603e376..3b5ca5e4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index 1046d036..047c7443 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 1e153a8e..738e5415 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index 2158cc02..e23b322c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index 5ad37c7a..b8f976dd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index 82b35bd0..eb272cc8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index 5f228647..2cf81ba1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 917aa711..f832a80b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class index c5dc6a1e..32c05fd8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 70f7c93d..8d57f1b7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index bc394167..d4ceb443 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index 78d4e3a4..fa9a302d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index 4fdb102b..cb596b31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index c32910b4..56016353 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index abbece84..5a337eb9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index 41ee8a64..cdd259e4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index 2fcaf9de..21eb47eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index d5eff44a..f5119cc8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index 20abf97b..45cd420e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index de602e7c..466ae724 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index 89c7e1a8..dd615cd4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 6bc97bee..fd200c4e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index 5ad75395..9a10c13e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index b768c50c..92dc5b4f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index 95ac9ed7..6bde3cf7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index a661e9be..482bcd2f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index e152687f..f8560d35 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index c9b8cc91..ca5460c5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index 157e733b..703163e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index 05f32cf6..f95adf52 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index 21cd4f4f..4799479f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index 97cbbb30..5296ea7a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index 8f67dcad..2a8b0148 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index 165dd64f..1a73b881 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index 5d3308ab..d240b739 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index e84c352c..6bbed1a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class index fc399367..481fbeee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index d3d036d7..cc5dd9fb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 0541fe06..117cbb08 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index 34bfeaa8..78fd0954 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 347ed304..61ebaacd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 7299950c..e3b9474b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index ba689b32..8fcb63da 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 63857ba9..e6dcbf15 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 7b73215e..c1684750 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index 71beedac..ce54f213 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 2967849f..c6828e08 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index f955ce30..18bde437 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index 481b2e69..40b630b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index f231eb08..a3360dfe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index 612e5846..f255ef55 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index 9d677339..f2c960f0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index 2966b923..967beab7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 8ac5fcf2..a693108c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index d8ff2753..2578e105 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index 2c63b67b..0129e985 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 87b0b5ec..03554da6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index e3b48cd7..b60b3eb0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index adfc2c30..0e80eec5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index f2f46ae9..6f24f871 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index 902bb6be..489ee69c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index 1d9c8217..9caa0a60 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 570ab02a..fc5e838b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index fdc90d9c..881358af 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index d3af2796..3e3107a0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index 0c8a55e2..779c256b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index 76531e78..f7aee8e1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index e0012e4c..2837ef7f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index 41f876e0..a1faa5cb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index e9888d78..f246d35e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index 4328b3b9..27420451 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index 8004f48d..3223cc9d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index a8ffb349..22ee0862 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index 89c1cd31..975cba41 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 8b94a1eb..703ba8dc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index a45896a3..99167e1e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index 763dc6de..cd44eab0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index e1279055..06dedd3d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index a638196a..fb889bc2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index 3c27e25e..e32f0176 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index a6778b56..e0222ef1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index 4bfe9bf9..6eba1d71 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index aae2c6e9..abfd4bed 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index cad9e80a..bb274671 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index 2f34f5f5..cb514b97 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index c435826b..8bb9a3cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index 468055a6..374792d6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index b1c81ab2..2cc855ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index 040f5805..3424cbb3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index 9d8abb2c..84c86eb8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index eac7a5ab..a4326943 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index bdf465d0..325ba9ed 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index 8c4cef93..c2fc0276 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 844c3838..bc46d0b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 5d964cfc..1aa6bae7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index 5275b211..6af1c2d5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index a60340a0..5c4317f5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index 9303ce43..2aec57e6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index f7ffe53a..1a420161 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index 87d62265..69ee0cea 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index 805db647..681721cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index e1522627..a16e2201 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index 493431ea..11c9d3d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index b5caedc5..92a45d02 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class index eae1e659..22bcc618 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class index f04dd22b..c5edd8ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class index 32644d1e..f08a824d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class index 74a58705..7e4ea3a6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class index 50501fcb..8d06a0e8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class index 8f1eb819..7506bd63 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class index 1c5ac786..2698739b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class index 2f089288..4e5eaec2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class index 2164815f..33c40b8d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class index 962cebc4..735f2fd7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class index 220efabe..e96b1739 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class index ba7a6967..f16c05d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index ca866ea1..73cab7a1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index c7a2df7e..8deaf130 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index 92ccbfa8..12074d17 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index e18cc5c6..5fb2de31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index c77ab14c..a7281f0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index a695a70f..67b1de28 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index b739853c..77a6e6c3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 5b305be9..53962979 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index 3643ff97..da59c1d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index 70979f44..0d5479f9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index 12bccee8..c79bdfdc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index 7a56c3f6..20359090 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index e0bef61e..4787013d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 8ed69de7..2481a5fb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index ee4cdb1b..6e6cf517 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index e42fb9fe..9625bd56 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index 902aa8b0..24e753f5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index b99b4f5c..335fbb21 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index 32ed417d..4111aa57 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index bf970859..ca4c6f2d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index 28dc0e7f..1a16ee08 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 0c436cea..69b4268f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index e2ddb42e..cc51fcb1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index 56b63f61..d1987015 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index d655069e..c6910b20 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index c72853f2..b1602ad1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index 5ecee434..d1302dd7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index cc8950c0..6d46a74e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 4d38cc49..45328d02 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index de2f21d6..d0f68324 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index a8f9d489..93cdb8ba 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index a4b99264..1d1f1ce2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index 6692c8c9..42b8fb5c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index 139107e9..270e231e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index ffa23c73..d2e97cc3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index ba28b230..58a469ca 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index 66732eac..1dc597e4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 641b311c..24e20a3d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index 3dd15b3f..510db4bb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index 15ba4550..f1bfba09 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 7cdf9b67..9077426f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index b8b39ace..ed849746 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index fcdbec6a..b1d19883 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index 97f6cd44..7251fc39 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 20b0949c..d3003c9a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 9833f07d..a97214a4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index 7899684d..94d4ecfa 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index ffa75918..6a27318e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index 716a0d4e..8a1ac863 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index 13884360..6bcb3cec 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index bfbc15f7..6591a3fc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index e2d1ab15..412603bb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index 423e51e4..9b378c34 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index 3be543ee..e5e88214 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index d8606602..57e629d4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 4dfe8b54..2e0d5003 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index d0b3667a..80dd36ee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index 266bf38f..97e4632d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index 3413a2d2..bf2620bf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index c76b1bf7..c3f9ba53 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index c047df49..806f9e32 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index 4c3be70d..ba827fb9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index 8d48c65a..5076c563 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index 136dda20..1404c2e0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index dc021e2e..8e125b36 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index c7d00f54..e9082858 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index e8a5625a..e9c66269 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index 5a855000..e02b06f7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index 8261a71d..1e709219 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index d31781c7..a88955b0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 4205cfdc..a5547532 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index 7b6a378e..6c73aa49 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index ad42d68f..7a64a1dd 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class index 14dc0861..baa1a480 100644 Binary files a/Dozentenmodulserver/bin/server/startServer.class and b/Dozentenmodulserver/bin/server/startServer.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index a1bd5139..fb2abbc3 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class index 59247610..fd8a3c2a 100644 Binary files a/Dozentenmodulserver/bin/util/XMLCreator.class and b/Dozentenmodulserver/bin/util/XMLCreator.class differ diff --git a/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar b/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar new file mode 100644 index 00000000..6f6877c5 Binary files /dev/null and b/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar differ diff --git a/Dozentenmodulserver/src/models/Configuration.java b/Dozentenmodulserver/src/models/Configuration.java new file mode 100644 index 00000000..1e616466 --- /dev/null +++ b/Dozentenmodulserver/src/models/Configuration.java @@ -0,0 +1,39 @@ +package models; + +public class Configuration { + + private String absolute_path; + private String sql_connection; + private String sql_user; + private String sql_pass; + + public static Configuration config =new Configuration(); + + public String getAbsolute_path() { + return absolute_path; + } + public void setAbsolute_path(String absolute_path) { + this.absolute_path = absolute_path; + } + public String getSql_connection() { + return sql_connection; + } + public void setSql_connection(String sql_connection) { + this.sql_connection = sql_connection; + } + public String getSql_user() { + return sql_user; + } + public void setSql_user(String sql_user) { + this.sql_user = sql_user; + } + public String getSql_pass() { + return sql_pass; + } + public void setSql_pass(String sql_pass) { + this.sql_pass = sql_pass; + } + + + +} diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index 97793778..a48b381e 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -31,5 +31,5 @@ public class BinaryListener implements Runnable log.info(new Date() +" - Started running BinaryListener"); server.serve(); } - + } diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 7382e965..ef434865 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException; public List getImageList() throws org.apache.thrift.TException; @@ -58,7 +58,7 @@ public class Server { public Map getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException; public Map getLectureData(String lecturename) throws org.apache.thrift.TException; @@ -82,7 +82,7 @@ public class Server { public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -98,7 +98,7 @@ public class Server { public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -203,13 +203,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException { - send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); + send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); @@ -225,6 +225,8 @@ public class Server { args.setRam(ram); args.setCpu(cpu); args.setImagePath(imagePath); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); sendBase("writeVLdata", args); } @@ -411,13 +413,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException { - send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version); + send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); @@ -429,6 +431,8 @@ public class Server { args.setCpu(cpu); args.setId(id); args.setVersion(version); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); sendBase("updateImageData", args); } @@ -713,9 +717,9 @@ public class Server { } } - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -734,7 +738,9 @@ public class Server { private long ram; private long cpu; private String imagePath; - public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private boolean isTemplate; + private long filesize; + public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; this.login = login; @@ -749,6 +755,8 @@ public class Server { this.ram = ram; this.cpu = cpu; this.imagePath = imagePath; + this.isTemplate = isTemplate; + this.filesize = filesize; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -767,6 +775,8 @@ public class Server { args.setRam(ram); args.setCpu(cpu); args.setImagePath(imagePath); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); args.write(prot); prot.writeMessageEnd(); } @@ -1041,9 +1051,9 @@ public class Server { } } - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1058,7 +1068,9 @@ public class Server { private long cpu; private String id; private String version; - public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private boolean isTemplate; + private long filesize; + public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; @@ -1069,6 +1081,8 @@ public class Server { this.cpu = cpu; this.id = id; this.version = version; + this.isTemplate = isTemplate; + this.filesize = filesize; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -1083,6 +1097,8 @@ public class Server { args.setCpu(cpu); args.setId(id); args.setVersion(version); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); args.write(prot); prot.writeMessageEnd(); } @@ -1456,7 +1472,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath); + result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize); result.setSuccessIsSet(true); return result; } @@ -1619,7 +1635,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version); + result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize); result.setSuccessIsSet(true); return result; } @@ -1986,7 +2002,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath,resultHandler); + iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize,resultHandler); } } @@ -2397,7 +2413,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); + iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize,resultHandler); } } @@ -4851,6 +4867,8 @@ public class Server { private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-11); private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-12); private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-13); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-14); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-15); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -4871,6 +4889,8 @@ public class Server { public long ram; // required public long cpu; // required public String imagePath; // required + public boolean isTemplate; // required + public long filesize; // 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 { @@ -4886,7 +4906,9 @@ public class Server { INTERNET((short)-10, "internet"), RAM((short)-11, "ram"), CPU((short)-12, "cpu"), - IMAGE_PATH((short)-13, "imagePath"); + IMAGE_PATH((short)-13, "imagePath"), + IS_TEMPLATE((short)-14, "isTemplate"), + FILESIZE((short)-15, "filesize"); private static final Map byName = new HashMap(); @@ -4927,6 +4949,10 @@ public class Server { return CPU; case -13: // IMAGE_PATH return IMAGE_PATH; + case -14: // IS_TEMPLATE + return IS_TEMPLATE; + case -15: // FILESIZE + return FILESIZE; default: return null; } @@ -4971,6 +4997,8 @@ public class Server { private static final int __INTERNET_ISSET_ID = 1; private static final int __RAM_ISSET_ID = 2; private static final int __CPU_ISSET_ID = 3; + private static final int __ISTEMPLATE_ISSET_ID = 4; + private static final int __FILESIZE_ISSET_ID = 5; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -5001,6 +5029,10 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("imagePath", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IS_TEMPLATE, new org.apache.thrift.meta_data.FieldMetaData("isTemplate", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeVLdata_args.class, metaDataMap); } @@ -5021,7 +5053,9 @@ public class Server { boolean internet, long ram, long cpu, - String imagePath) + String imagePath, + boolean isTemplate, + long filesize) { this(); this.imagename = imagename; @@ -5041,6 +5075,10 @@ public class Server { this.cpu = cpu; setCpuIsSet(true); this.imagePath = imagePath; + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + this.filesize = filesize; + setFilesizeIsSet(true); } /** @@ -5079,6 +5117,8 @@ public class Server { if (other.isSetImagePath()) { this.imagePath = other.imagePath; } + this.isTemplate = other.isTemplate; + this.filesize = other.filesize; } public writeVLdata_args deepCopy() { @@ -5104,6 +5144,10 @@ public class Server { setCpuIsSet(false); this.cpu = 0; this.imagePath = null; + setIsTemplateIsSet(false); + this.isTemplate = false; + setFilesizeIsSet(false); + this.filesize = 0; } public String getImagename() { @@ -5414,6 +5458,52 @@ public class Server { } } + public boolean isIsTemplate() { + return this.isTemplate; + } + + public writeVLdata_args setIsTemplate(boolean isTemplate) { + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + return this; + } + + public void unsetIsTemplate() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */ + public boolean isSetIsTemplate() { + return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + public void setIsTemplateIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value); + } + + public long getFilesize() { + return this.filesize; + } + + public writeVLdata_args setFilesize(long filesize) { + this.filesize = filesize; + setFilesizeIsSet(true); + return this; + } + + public void unsetFilesize() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + /** Returns true if field filesize is set (has been assigned a value) and false otherwise */ + public boolean isSetFilesize() { + return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + public void setFilesizeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -5520,6 +5610,22 @@ public class Server { } break; + case IS_TEMPLATE: + if (value == null) { + unsetIsTemplate(); + } else { + setIsTemplate((Boolean)value); + } + break; + + case FILESIZE: + if (value == null) { + unsetFilesize(); + } else { + setFilesize((Long)value); + } + break; + } } @@ -5564,6 +5670,12 @@ public class Server { case IMAGE_PATH: return getImagePath(); + case IS_TEMPLATE: + return Boolean.valueOf(isIsTemplate()); + + case FILESIZE: + return Long.valueOf(getFilesize()); + } throw new IllegalStateException(); } @@ -5601,6 +5713,10 @@ public class Server { return isSetCpu(); case IMAGE_PATH: return isSetImagePath(); + case IS_TEMPLATE: + return isSetIsTemplate(); + case FILESIZE: + return isSetFilesize(); } throw new IllegalStateException(); } @@ -5735,6 +5851,24 @@ public class Server { return false; } + boolean this_present_isTemplate = true; + boolean that_present_isTemplate = true; + if (this_present_isTemplate || that_present_isTemplate) { + if (!(this_present_isTemplate && that_present_isTemplate)) + return false; + if (this.isTemplate != that.isTemplate) + return false; + } + + boolean this_present_filesize = true; + boolean that_present_filesize = true; + if (this_present_filesize || that_present_filesize) { + if (!(this_present_filesize && that_present_filesize)) + return false; + if (this.filesize != that.filesize) + return false; + } + return true; } @@ -5881,6 +6015,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsTemplate()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isTemplate, other.isTemplate); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFilesize()).compareTo(other.isSetFilesize()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFilesize()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filesize, other.filesize); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -5988,6 +6142,14 @@ public class Server { sb.append(this.imagePath); } first = false; + if (!first) sb.append(", "); + sb.append("isTemplate:"); + sb.append(this.isTemplate); + first = false; + if (!first) sb.append(", "); + sb.append("filesize:"); + sb.append(this.filesize); + first = false; sb.append(")"); return sb.toString(); } @@ -6137,6 +6299,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -14: // IS_TEMPLATE + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -15: // FILESIZE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -6152,6 +6330,12 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); if (struct.imagePath != null) { oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); oprot.writeString(struct.imagePath); @@ -6266,7 +6450,13 @@ public class Server { if (struct.isSetImagePath()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetIsTemplate()) { + optionals.set(13); + } + if (struct.isSetFilesize()) { + optionals.set(14); + } + oprot.writeBitSet(optionals, 15); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } @@ -6306,12 +6496,18 @@ public class Server { if (struct.isSetImagePath()) { oprot.writeString(struct.imagePath); } + if (struct.isSetIsTemplate()) { + oprot.writeBool(struct.isTemplate); + } + if (struct.isSetFilesize()) { + oprot.writeI64(struct.filesize); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(13); + BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -6364,6 +6560,14 @@ public class Server { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); } + if (incoming.get(13)) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } + if (incoming.get(14)) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } } } @@ -13126,6 +13330,8 @@ public class Server { private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-7); 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)-8); private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-10); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-11); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -13142,6 +13348,8 @@ public class Server { public long cpu; // required public String id; // required public String version; // required + public boolean isTemplate; // required + public long filesize; // 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 { @@ -13153,7 +13361,9 @@ public class Server { RAM((short)-6, "ram"), CPU((short)-7, "cpu"), ID((short)-8, "id"), - VERSION((short)-9, "version"); + VERSION((short)-9, "version"), + IS_TEMPLATE((short)-10, "isTemplate"), + FILESIZE((short)-11, "filesize"); private static final Map byName = new HashMap(); @@ -13186,6 +13396,10 @@ public class Server { return ID; case -9: // VERSION return VERSION; + case -10: // IS_TEMPLATE + return IS_TEMPLATE; + case -11: // FILESIZE + return FILESIZE; default: return null; } @@ -13230,6 +13444,8 @@ public class Server { private static final int __INTERNET_ISSET_ID = 1; private static final int __RAM_ISSET_ID = 2; private static final int __CPU_ISSET_ID = 3; + private static final int __ISTEMPLATE_ISSET_ID = 4; + private static final int __FILESIZE_ISSET_ID = 5; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -13252,6 +13468,10 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IS_TEMPLATE, new org.apache.thrift.meta_data.FieldMetaData("isTemplate", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageData_args.class, metaDataMap); } @@ -13268,7 +13488,9 @@ public class Server { long ram, long cpu, String id, - String version) + String version, + boolean isTemplate, + long filesize) { this(); this.name = name; @@ -13284,6 +13506,10 @@ public class Server { setCpuIsSet(true); this.id = id; this.version = version; + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + this.filesize = filesize; + setFilesizeIsSet(true); } /** @@ -13310,6 +13536,8 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + this.isTemplate = other.isTemplate; + this.filesize = other.filesize; } public updateImageData_args deepCopy() { @@ -13331,6 +13559,10 @@ public class Server { this.cpu = 0; this.id = null; this.version = null; + setIsTemplateIsSet(false); + this.isTemplate = false; + setFilesizeIsSet(false); + this.filesize = 0; } public String getName() { @@ -13545,6 +13777,52 @@ public class Server { } } + public boolean isIsTemplate() { + return this.isTemplate; + } + + public updateImageData_args setIsTemplate(boolean isTemplate) { + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + return this; + } + + public void unsetIsTemplate() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */ + public boolean isSetIsTemplate() { + return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + public void setIsTemplateIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value); + } + + public long getFilesize() { + return this.filesize; + } + + public updateImageData_args setFilesize(long filesize) { + this.filesize = filesize; + setFilesizeIsSet(true); + return this; + } + + public void unsetFilesize() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + /** Returns true if field filesize is set (has been assigned a value) and false otherwise */ + public boolean isSetFilesize() { + return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + public void setFilesizeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -13619,6 +13897,22 @@ public class Server { } break; + case IS_TEMPLATE: + if (value == null) { + unsetIsTemplate(); + } else { + setIsTemplate((Boolean)value); + } + break; + + case FILESIZE: + if (value == null) { + unsetFilesize(); + } else { + setFilesize((Long)value); + } + break; + } } @@ -13651,6 +13945,12 @@ public class Server { case VERSION: return getVersion(); + case IS_TEMPLATE: + return Boolean.valueOf(isIsTemplate()); + + case FILESIZE: + return Long.valueOf(getFilesize()); + } throw new IllegalStateException(); } @@ -13680,6 +13980,10 @@ public class Server { return isSetId(); case VERSION: return isSetVersion(); + case IS_TEMPLATE: + return isSetIsTemplate(); + case FILESIZE: + return isSetFilesize(); } throw new IllegalStateException(); } @@ -13778,6 +14082,24 @@ public class Server { return false; } + boolean this_present_isTemplate = true; + boolean that_present_isTemplate = true; + if (this_present_isTemplate || that_present_isTemplate) { + if (!(this_present_isTemplate && that_present_isTemplate)) + return false; + if (this.isTemplate != that.isTemplate) + return false; + } + + boolean this_present_filesize = true; + boolean that_present_filesize = true; + if (this_present_filesize || that_present_filesize) { + if (!(this_present_filesize && that_present_filesize)) + return false; + if (this.filesize != that.filesize) + return false; + } + return true; } @@ -13884,6 +14206,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsTemplate()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isTemplate, other.isTemplate); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFilesize()).compareTo(other.isSetFilesize()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFilesize()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filesize, other.filesize); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -13959,6 +14301,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("isTemplate:"); + sb.append(this.isTemplate); + first = false; + if (!first) sb.append(", "); + sb.append("filesize:"); + sb.append(this.filesize); + first = false; sb.append(")"); return sb.toString(); } @@ -14076,6 +14426,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -10: // IS_TEMPLATE + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -11: // FILESIZE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -14091,6 +14457,12 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); if (struct.version != null) { oprot.writeFieldBegin(VERSION_FIELD_DESC); oprot.writeString(struct.version); @@ -14173,7 +14545,13 @@ public class Server { if (struct.isSetVersion()) { optionals.set(8); } - oprot.writeBitSet(optionals, 9); + if (struct.isSetIsTemplate()) { + optionals.set(9); + } + if (struct.isSetFilesize()) { + optionals.set(10); + } + oprot.writeBitSet(optionals, 11); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -14201,12 +14579,18 @@ public class Server { if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetIsTemplate()) { + oprot.writeBool(struct.isTemplate); + } + if (struct.isSetFilesize()) { + oprot.writeI64(struct.filesize); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(9); + BitSet incoming = iprot.readBitSet(11); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -14243,6 +14627,14 @@ public class Server { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(9)) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } + if (incoming.get(10)) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index bf71607a..95b261d3 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -18,19 +18,23 @@ import java.util.UUID; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; +import models.Configuration; + import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.apache.thrift.TException; +import org.ini4j.Wini; import sql.SQL; import util.XMLCreator; public class ServerHandler implements Server.Iface { - static SQL sql = new SQL(); static Connection con = sql.getConnection(); private static Logger log = Logger.getLogger(ServerHandler.class); + + @Override public User getFtpUser() throws TException { log.info(new Date() + " - returing FTPUser..."); @@ -38,7 +42,7 @@ public class ServerHandler implements Server.Iface { user.setUserName(UUID.randomUUID().toString().substring(0, 8)); user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() .substring(0, 8))); - user.setPath("/srv/openslx/nfs/temp"); + user.setPath(Configuration.config.getAbsolute_path()); SQL sql = new SQL(); Connection con = sql.getConnection(); sql.writeFTPUser(con, user.getUserName(), user.getPassword()); @@ -85,7 +89,7 @@ public class ServerHandler implements Server.Iface { public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, - long ram, long cpu, String imagePath) throws TException { + long ram, long cpu, String imagePath, boolean isTemplate ,long filesize) throws TException { String pk_institution = sql.setInstitution(con, university); @@ -93,7 +97,7 @@ public class ServerHandler implements Server.Iface { new Date(), pk_institution); sql.setImageData(con, pk_person, license, internet, cpu, ram, - imagename, imagePath); + imagename, imagePath,isTemplate ,filesize); log.info(new Date() + " - written VLdata"); // TODO Auto-generated method stub @@ -216,7 +220,8 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean startFileCopy(String file) throws TException { + public boolean startFileCopy(String filename) throws TException { + String file=Configuration.config.getAbsolute_path()+"temp/"+filename; File tmpFile = new File(file); log.info(new Date() + " - Trying to move file to '/srv/openslx/nfs/prod/"+tmpFile.getName() +"'"); @@ -227,10 +232,9 @@ public class ServerHandler implements Server.Iface { // eingelesen? //FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" // + tmpFile.getName())); - FileUtils.moveFile(tmpFile, new File("/srv/openslx/nfs/prod/" - + tmpFile.getName())); - - + FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path()+"prod/"+filename)); + int ret=sql.UpdateImagePath(con, filename); + log.info(new Date() + " - update "+ret); log.info(new Date() + " - file moved"); } catch (IOException e) { @@ -277,9 +281,9 @@ public class ServerHandler implements Server.Iface { @Override public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, - String version) throws TException { + String version, boolean isTemplate, long filesize) throws TException { sql.UpdateImageData(con, name, newName,image_path, license, internet, cpu, ram, - id, version); + id, version, isTemplate, filesize); return false; } @@ -360,7 +364,7 @@ public class ServerHandler implements Server.Iface { String stringFile = sql.getFile(con, imageid, imageversion); log.info(new Date() + " - File to Delete: " + stringFile); - File tmpFile = new File(stringFile); + File tmpFile = new File(Configuration.config.getAbsolute_path()+stringFile); try { // File wird von Server gelöscht @@ -396,7 +400,7 @@ public class ServerHandler implements Server.Iface { String date = rs.getString("admin_createTime").replace(" ", "") .replace("-", "").replace(":", ""); String name = rs.getString("name"); - String path = "/srv/openslx/nfs/temp/" + String path = Configuration.config.getAbsolute_path()+"temp/" + date.substring(0, date.length() - 2) + "_" + hs + "_" + user + "_" + name + ".xml"; File xmlFile = new File(path); @@ -412,4 +416,5 @@ public class ServerHandler implements Server.Iface { } + } diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index 542c92b8..949b3538 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -1,11 +1,17 @@ package server; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; +import models.Configuration; + import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; +import org.ini4j.InvalidFileFormatException; +import org.ini4j.Wini; import server.BinaryListener; @@ -22,6 +28,21 @@ public class startServer { public static void main(String[] args) { + //get Configuration + try { + Wini ini=new Wini(new File("Server_Config.ini")); + Configuration.config.setAbsolute_path(ini.get("ftp", "path_absolute")); + Configuration.config.setSql_connection(ini.get("sql", "connection")); + Configuration.config.setSql_pass(ini.get("sql", "pass")); + Configuration.config.setSql_user(ini.get("sql", "user")); + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + //Start Server BasicConfigurator.configure(); log.info( new Date() + " - starting Application\n" ); Thread t; diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 36aadd89..69843988 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -8,6 +8,8 @@ import java.util.Date; import java.util.Random; import java.util.UUID; +import models.Configuration; + import org.apache.log4j.Logger; import server.BinaryListener; @@ -25,7 +27,7 @@ public class SQL { } try { Connection con = DriverManager - .getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=slx-ng-open"); + .getConnection("jdbc:mysql://"+Configuration.config.getSql_connection()+"?user="+Configuration.config.getSql_user()+"&password="+Configuration.config.getSql_pass()+""); con.setAutoCommit(false); log.info(new Date() + " - Connection returned to Client."); return con; @@ -47,7 +49,7 @@ public class SQL { + user + "',SHA1('" + pass - + "'),'10001','12345','/srv/openslx/nfs/temp');"); + + "'),'10001','12345','"+Configuration.config.getAbsolute_path()+"temp/');"); con.commit(); log.info(new Date() + " - created FTPUser " + user + " : " + pass + "."); @@ -201,7 +203,7 @@ public class SQL { public boolean setImageData(Connection con, String pk_person, boolean license, boolean internet, long cpu, long ram, String imagename, - String imagePath) { + String imagePath, boolean isTemplate, long filesize) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -218,7 +220,7 @@ public class SQL { Statement stm = con.createStatement(); String uid = UUID.randomUUID().toString(); - stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('" + stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`)VALUES('" + uid // GUID_imageID + "',1,'" // imageVersion + imagename // image_name @@ -244,6 +246,8 @@ public class SQL { + "','" + internet_bol // cond_hasInternetRestriction + "','" + ram // cond_minRAM + "','" + cpu // cond_minCPUs + + "','" + isTemplate //image_isTemplate + + "','" + filesize //image_filesize + "');"); con.commit(); @@ -390,7 +394,6 @@ public class SQL { public ResultSet getImageData(Connection con, String id, String version) { try { Statement stm = con.createStatement(); - System.out.println("Test"); return stm .executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '" + id + "' and imageVersion = '" + version + "' ;"); @@ -404,7 +407,7 @@ public class SQL { public int UpdateImageData(Connection con, String name, String newName,String image_path, boolean license, boolean internet, long cpu, long ram, String id, - String version) { + String version, boolean isTemplate, long filesize) { try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); Statement stm = con.createStatement(); @@ -438,6 +441,10 @@ public class SQL { + ram + "',`cond_minCPUs` = '" + cpu + + "',`image_isTemplate` = '" + + isTemplate + + "',`image_filesize` = '" + + filesize + "' WHERE `GUID_imageID` = '" + id + "' AND `imageVersion` = '" + version + "';"); @@ -599,4 +606,24 @@ public class SQL { return null; } + + public int UpdateImagePath(Connection con, String name) { + try { + + Statement stm = con.createStatement(); + String image_path="prod/"+name; + + stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '" + + image_path + + "' WHERE `image_path` = '" + + "temp/"+name + "';"); + con.commit(); + return 0; + } catch (SQLException e) { + // TODO Auto-generated catch block + log.info(new Date() + " - Failed to UpdateImageData."); + e.printStackTrace(); + } + return -1; + } } diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java index 111a6337..bf49dfe3 100644 --- a/Dozentenmodulserver/src/util/XMLCreator.java +++ b/Dozentenmodulserver/src/util/XMLCreator.java @@ -18,6 +18,8 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import models.Configuration; + import org.apache.log4j.Logger; import org.w3c.dom.Comment; import org.w3c.dom.Document; @@ -36,7 +38,7 @@ public class XMLCreator { private Statement st = null; private ResultSet rs = null; private String vmName; - private String filePath = "/srv/openslx/nfs/temp/"; + private String filePath = Configuration.config.getAbsolute_path()+"prod/"; private String imageName; private String xmlName; private static Logger log = Logger.getLogger( BinaryListener.class ); diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 088ea8fb..94ddde43 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -36,7 +36,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string image_id,string version), - bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), + bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize), list getImageList(), list getLectureList(), list getAllOS(), @@ -44,7 +44,7 @@ service Server{ bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), bool startFileCopy(string file), map getImageData(string imageid, string imageversion), - bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version), + bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize), map getLectureData(string lecturename), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), -- cgit v1.2.3-55-g7522 From 87eabc4f21e81ecb16e4aca10b616eefa1823ac6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 13:58:51 +0200 Subject: FAQ & OTRS --- .../bin/gui/image/CreateImageAllgemein_GUI$1.class | Bin 1008 -> 1008 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 8273 -> 8422 bytes .../bin/gui/image/CreateImageTechnisch_GUI$1.class | Bin 758 -> 758 bytes .../bin/gui/image/CreateImageTechnisch_GUI$2.class | Bin 847 -> 847 bytes .../bin/gui/image/CreateImageTechnisch_GUI$3.class | Bin 1673 -> 1673 bytes .../bin/gui/image/CreateImageTechnisch_GUI$4.class | Bin 1667 -> 1667 bytes .../bin/gui/image/CreateImageTechnisch_GUI.class | Bin 8784 -> 8933 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12396 -> 12528 bytes .../bin/gui/image/EditImageAllgemein_GUI$1.class | Bin 867 -> 867 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 956 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 1008 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9611 -> 9756 bytes .../bin/gui/image/EditImageTechnisch_GUI$1.class | Bin 746 -> 746 bytes .../bin/gui/image/EditImageTechnisch_GUI$2.class | Bin 835 -> 835 bytes .../bin/gui/image/EditImageTechnisch_GUI$3.class | Bin 1691 -> 1691 bytes .../bin/gui/image/EditImageTechnisch_GUI$4.class | Bin 1685 -> 1685 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 8510 -> 8655 bytes .../bin/gui/image/FTPCreateUploader_GUI$1.class | Bin 792 -> 792 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$6.class | Bin 2040 -> 2040 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 2125 -> 2125 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1014 -> 1014 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12804 -> 13234 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 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 2030 -> 1325 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 972 -> 1324 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 10352 -> 11061 bytes .../bin/gui/image/FTPEditUploader_GUI$1.class | Bin 782 -> 782 bytes .../bin/gui/image/FTPEditUploader_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$4.class | Bin 1186 -> 1186 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI$6.class | Bin 1836 -> 1836 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12324 -> 12750 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 1094 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 951 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 12270 -> 12411 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 12060 -> 12192 bytes .../bin/gui/intro/BillOfRights_GUI$1.class | Bin 710 -> 710 bytes .../bin/gui/intro/BillOfRights_GUI$2.class | Bin 2231 -> 2231 bytes .../bin/gui/intro/BillOfRights_GUI$3.class | Bin 959 -> 959 bytes Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class | Bin 10827 -> 11020 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 10545 -> 10734 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class | Bin 695 -> 695 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class | Bin 1629 -> 1629 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class | Bin 2192 -> 2192 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class | Bin 827 -> 827 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 5311 -> 5449 bytes .../gui/lecture/CreateLectureAllgemein_GUI$1.class | Bin 1034 -> 1034 bytes .../gui/lecture/CreateLectureAllgemein_GUI$2.class | Bin 869 -> 869 bytes .../gui/lecture/CreateLectureAllgemein_GUI$3.class | Bin 926 -> 926 bytes .../gui/lecture/CreateLectureAllgemein_GUI$4.class | Bin 923 -> 923 bytes .../gui/lecture/CreateLectureAllgemein_GUI$5.class | Bin 1922 -> 1922 bytes .../gui/lecture/CreateLectureAllgemein_GUI$6.class | Bin 3105 -> 3105 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10819 -> 10976 bytes .../gui/lecture/EditLectureAllgemein_GUI$1.class | Bin 768 -> 768 bytes .../gui/lecture/EditLectureAllgemein_GUI$2.class | Bin 857 -> 857 bytes .../gui/lecture/EditLectureAllgemein_GUI$3.class | Bin 1892 -> 1892 bytes .../gui/lecture/EditLectureAllgemein_GUI$4.class | Bin 1951 -> 1951 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 10004 -> 10157 bytes .../lecture/ExtendedSearchForImages_GUI$1.class | Bin 786 -> 786 bytes .../lecture/ExtendedSearchForImages_GUI$2.class | Bin 937 -> 937 bytes .../lecture/ExtendedSearchForImages_GUI$3.class | Bin 931 -> 931 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 6505 -> 6724 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 35 +++++++++++ .../src/gui/image/CreateImageTechnisch_GUI.java | 37 +++++++++++ Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 48 +++++++++----- .../src/gui/image/EditImageAllgemein_GUI.java | 36 +++++++++++ .../src/gui/image/EditImageTechnisch_GUI.java | 36 ++++++++++- .../src/gui/image/FTPCreateUploader_GUI.java | 37 ++++++++++- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 70 ++++++++++++++++++--- .../src/gui/image/FTPEditUploader_GUI.java | 49 ++++++++++++++- .../src/gui/image/SearchEditImage_GUI.java | 36 +++++++++++ Dozentenmodul/src/gui/image/SearchImage_GUI.java | 36 +++++++++++ .../src/gui/image/SearchMethodLecture_GUI.java | 37 +++++++++++ Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 38 +++++++++++ Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 38 +++++++++++ Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 40 +++++++++++- .../gui/lecture/CreateLectureAllgemein_GUI.java | 36 +++++++++++ .../src/gui/lecture/CreateLectureLink_GUI.java | 36 +++++++++++ .../src/gui/lecture/DeleteLecture_GUI.java | 37 +++++++++++ .../src/gui/lecture/EditLectureAllgemein_GUI.java | 37 +++++++++++ .../src/gui/lecture/EditLectureLink_GUI.java | 36 +++++++++++ .../src/gui/lecture/EditLectureSearch_GUI.java | 36 +++++++++++ .../gui/lecture/ExtendedSearchForImages_GUI.java | 40 ++++++++++++ .../src/gui/lecture/SearchLecture_GUI.java | 37 +++++++++++ Dozentenmodul/src/models/Links.java | 15 +++++ 114 files changed, 855 insertions(+), 28 deletions(-) create mode 100644 Dozentenmodul/src/models/Links.java (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class index d5e68cc7..b6db4a44 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class index 35392672..192b81a6 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 de93b267..b75c16b3 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 be1e5801..c68ae652 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 0e5865b9..6460158f 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class index 04edeee9..1d67fe3e 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class index a88a21f5..9fc35b48 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class index 1ac1680a..4aedd907 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class index ac331f22..2c9cd712 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class index 6fa84ba9..82d24993 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index d7c2577d..567fc96b 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$1.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class index 7692bcfb..538a8eb4 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 4b3d190a..6617ad6e 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index a7677d8e..1a5a0fe5 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index 9ef38fa1..b2656782 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class index 216e48c4..ba4c1b16 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class index d22c246d..9ec941b5 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class index 4edb101c..20b74c24 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class index b31208f2..77c79351 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class index 7b09a9c7..7253db83 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class index 34ef1b8c..353bafa4 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$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 20f615b4..94acbae9 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 e0fabcc6..0081eba4 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$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index 0d982996..9f6747a9 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 65c67d65..e013392a 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 79c3a835..3b3ec0ee 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 735ff875..7ec6679a 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 1b6ed7d5..e2be756c 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 57505d9b..b8a6fad4 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 53ce9bf1..001d50ef 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 d72b7fd9..d345024c 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 a86cfda4..5a20444c 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 4ef7cd96..e6cb6231 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 d9f847f2..3a0bf56a 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$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class index a25d7157..56759209 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class index 55d72ee9..19ad69d7 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 23f71ee1..74aaef08 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class index dfb69143..23321e4e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index 87c0067c..aa1b5a70 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class index 563e41cb..3ee3ca66 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 8a8771d9..c3611ea8 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 89997bb5..885bcd1e 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$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 87bf6d5f..196208c4 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$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index 35e33e48..cdf3cad7 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 d058454e..5d6c601d 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 5713f420..7207fba7 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 a0172be7..4400254b 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 ab7702e4..eca0e58d 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 c868afe6..64a6e9c9 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 92fcc494..46b870e2 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 f8d904d8..24a37378 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 5e1dc507..0908c65a 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 46fdf45d..88e9e10c 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 1e1dc0f3..95a953f3 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 39a39cf6..d7bc6bab 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 70661228..7e083945 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 a69337f6..34ba71c8 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 0d4bafa7..6608b6fa 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 84ebd55c..a7494fc1 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/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class index 2891e710..ab46596e 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 bd12ec95..5d4f34b1 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 c964162e..94f25f6e 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 f2dd265c..ac807987 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 3ba22ff0..725c8726 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 c867b9d2..8a3d58a4 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 e4239a4e..0a07460d 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 fa189dbb..22272f1d 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 843f828c..989819df 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 a373ce86..fba829d8 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 c035deed..ba1ed4b3 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 39963963..be8f1a48 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 3f17b0d6..0527987f 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 c9b6e28a..a1ae48ca 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 3485b280..1a30bb2e 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 2cd12110..0b931e12 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/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class index 9b994ec4..12d4c61f 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class index 6862545b..51b3d910 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class index d71d71d5..ceea662a 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class index 9fe72770..67922a25 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class index 09017e11..11cda571 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class index adcc7fd5..0759ddca 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 58677633..8f480656 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class index dd70f264..0c7b67a0 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class index 22209c73..09461d3a 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class index 808b6d99..a43a2ad6 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class index c412ac7b..e2bcac46 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class index 81bbec82..f5f80af3 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class index 8ae5f63c..194553e1 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class index 79f4356c..beea9e15 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class index b6c8be8f..764ffbee 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class index 14d5f97e..c6169313 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index f3b4d732..8fba3fb9 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -32,10 +32,12 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import models.Image; +import models.Links; import models.person; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -298,9 +300,42 @@ public class CreateImageAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); }//end main diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index cf71082c..f9cd20dd 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -30,12 +30,15 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; + import javax.swing.JRadioButton; import javax.swing.ButtonGroup; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; import models.Image; +import models.Links; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { @@ -357,9 +360,43 @@ public class CreateImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 9956f677..79e37076 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -17,6 +17,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -46,6 +47,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; @@ -456,20 +459,6 @@ public class DeleteImage_GUI extends JFrame { e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // TODO --> client.deleteImageServer(imageid - // ,imageversion) - // das file ist aus der DB raus, aber ist noch - // auf dem Server als Datei hinterlegt. - // dieses muss auch gelöscht werden, um den - // festplattenlatz wieder frei zu geben. - // Hierzu könnte ein löschbefehl an die kommande - // zeile des server geschickt werden - // um das entsprechende file zu löschen. - // identifizieren über den image-namen!! - // z.B. FileUtils.moveFile(tmpFile, new - // File("141.79.128.102:/srv//openslx/nfs/temp/"+ - // tmpFile.getName())); - // FileUtils.ForceDelete (.. ); } else { @@ -535,9 +524,40 @@ public class DeleteImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 0c50cc2b..8e928105 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Map; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +34,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import org.apache.thrift.TException; import models.Image; +import models.Links; import models.person; import server.Server.Client; import thrift.ThriftConnection; @@ -315,9 +317,43 @@ public class EditImageAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); // setFocusTraversalPolicy(new FocusTraversalOnArray(new // Component[]{getContentPane(), panel_2, lblNewLabel, diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 631e3c2d..7636c946 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; + import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +35,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; +import models.Links; @SuppressWarnings("serial") public class EditImageTechnisch_GUI extends JFrame { @@ -341,11 +344,42 @@ public class EditImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); } - } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 49fcf0d0..13c83d61 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,6 +35,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -41,6 +43,9 @@ import thrift.ThriftConnection; //import util.XMLCreator; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPCreateUploader_GUI extends JFrame implements @@ -378,9 +383,37 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + } + }); + menu.add(menuItem_1); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index ec92396b..fa164171 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -6,6 +6,8 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Toolkit; import java.io.File; +import java.io.IOException; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -31,10 +33,17 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; import models.Image; +import models.Links; + import org.apache.thrift.TException; import server.Server.Client; import server.User; import thrift.ThriftConnection; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { @@ -217,7 +226,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JPanel panel = new JPanel(); panel.setLayout(null); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); + panel.setBounds(10, 24, 577, 57); contentPanel.add(panel); JLabel lblImageDownloader = new JLabel("Image Downloader"); @@ -233,29 +242,29 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener panel.add(txtpnWhlenSieEinen); JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); + separator.setBounds(0, 88, 597, 2); contentPanel.add(separator); JLabel label_1 = new JLabel("Hauptmen\u00FC"); label_1.setForeground(Color.BLUE); - label_1.setBounds(20, 88, 61, 20); + label_1.setBounds(20, 92, 61, 20); contentPanel.add(label_1); JLabel label_2 = new JLabel(">"); - label_2.setBounds(80, 91, 14, 14); + label_2.setBounds(80, 95, 14, 14); contentPanel.add(label_2); JLabel label_3 = new JLabel("VL-Image"); label_3.setForeground(Color.BLUE); - label_3.setBounds(91, 88, 46, 20); + label_3.setBounds(91, 92, 46, 20); contentPanel.add(label_3); JLabel label_4 = new JLabel(">"); - label_4.setBounds(139, 91, 14, 14); + label_4.setBounds(139, 95, 14, 14); contentPanel.add(label_4); JLabel label_5 = new JLabel("Neu/Bearbeiten"); - label_5.setBounds(149, 91, 108, 14); + label_5.setBounds(149, 95, 108, 14); contentPanel.add(label_5); JSeparator separator_1 = new JSeparator(); @@ -278,6 +287,53 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Klicken Sie auf \"Fertigstellen\"."); lblKlickenSieAuf.setBounds(98, 423, 241, 14); contentPanel.add(lblKlickenSieAuf); + + JMenuBar menuBar = new JMenuBar(); + menuBar.setBounds(0, 0, 597, 21); + contentPanel.add(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + menu.add(menuItem_1); { JPanel buttonPane = new JPanel(); buttonPane.setBackground(UIManager.getColor("Button.background")); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 8d14458a..8b14dc4c 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,12 +35,16 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPEditUploader_GUI extends JFrame implements @@ -366,9 +371,49 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + menu.add(menuItem_1); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 7c35bf00..1195b8a3 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -468,9 +470,43 @@ public class SearchEditImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 4e6e7046..735c6c99 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -423,9 +425,43 @@ public class SearchImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 49d7810b..065b3da7 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -33,6 +34,8 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + @SuppressWarnings("serial") public class SearchMethodLecture_GUI extends JFrame { @@ -242,9 +245,43 @@ public class SearchMethodLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 988a8b38..268acb14 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -33,8 +33,12 @@ import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @@ -189,9 +193,43 @@ public class BillOfRights_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4817e786..4e010f75 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -33,7 +33,11 @@ import java.awt.ScrollPane; import javax.swing.JTextArea; import javax.swing.ImageIcon; +import models.Links; import models.SessionData; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -407,9 +411,43 @@ public class MainMenue_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); }// end main diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 1c0a51c0..93300f3e 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -35,6 +35,8 @@ import javax.swing.JCheckBox; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; +import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; @@ -211,11 +213,45 @@ public class VmWareLink_GUI extends JFrame { menuBar.add(mnHilfe); { JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnHilfe.add(mntmFaq); } { - JMenuItem mntmHilfe = new JMenuItem("Hilfe"); - mnHilfe.add(mntmHilfe); + JMenuItem mntmOTRS = new JMenuItem("OTRS"); + mntmOTRS.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + mnHilfe.add(mntmOTRS); } } } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 02946571..3192da83 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -32,9 +32,11 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; import java.util.Calendar; import java.util.Date; @@ -491,9 +493,43 @@ public class CreateLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 285a4ff6..daec54ad 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -44,6 +45,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -457,9 +459,43 @@ public class CreateLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 4c20c666..32110a9f 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -43,6 +44,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -410,9 +413,43 @@ public class DeleteLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 348b1c77..0be23ee0 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -34,9 +34,12 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; + import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; import javax.swing.ButtonGroup; @@ -403,9 +406,43 @@ public class EditLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 4160f855..28447e0d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -43,6 +44,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -439,9 +441,43 @@ public class EditLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index badcf86a..08a68f7f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -47,6 +48,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -469,9 +471,43 @@ public class EditLectureSearch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 095ca7ef..cd417720 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -32,6 +32,12 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; + @SuppressWarnings("serial") public class ExtendedSearchForImages_GUI extends JFrame { @@ -228,9 +234,43 @@ public class ExtendedSearchForImages_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 413f1084..a8c417fa 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -42,6 +43,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -359,9 +362,43 @@ public class SearchLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java new file mode 100644 index 00000000..dba1771d --- /dev/null +++ b/Dozentenmodul/src/models/Links.java @@ -0,0 +1,15 @@ +package models; + +public class Links { + + private static String FAQ = "http://bwlehrpool.hs-offenburg.de/"; + private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl"; + + public static String getFAQ() { + return FAQ; + } + + public static String getOTRS() { + return OTRS; + } +} -- cgit v1.2.3-55-g7522 From 12b69856a4388107773b05b974667b580d18b53b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 14:10:30 +0200 Subject: faq otrs --- .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1348 -> 1351 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class | Bin 1325 -> 1325 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class | Bin 1324 -> 1327 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/CreateImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/EditImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/EditImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/FTPCreateUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchEditImage_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 4 ++-- .../src/gui/image/SearchMethodLecture_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureLink_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureSearch_GUI.java | 4 ++-- .../src/gui/lecture/ExtendedSearchForImages_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java | 4 ++-- 24 files changed, 42 insertions(+), 42 deletions(-) (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index faac5bc5..22538b35 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/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class index 5a20444c..aac529c9 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 e6cb6231..457d19d5 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/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 8fba3fb9..faf95699 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -302,7 +302,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -322,7 +322,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index f9cd20dd..6add313b 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -362,7 +362,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -382,7 +382,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 6725850b..49a97051 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -319,7 +319,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -339,7 +339,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 7636c946..e8d0f5f8 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -346,7 +346,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -365,7 +365,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 3a78e322..f36a4c5d 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -370,7 +370,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); @@ -390,7 +390,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { } }); menu.add(menuItem_1); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index fa164171..671b2170 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -298,7 +298,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -318,7 +318,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 68bd4bb1..3c17a3e5 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -360,7 +360,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -380,7 +380,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 1195b8a3..b6ea90b4 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -472,7 +472,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -492,7 +492,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 735c6c99..8fc7d164 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -427,7 +427,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -447,7 +447,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 065b3da7..17b6ab59 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -247,7 +247,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -267,7 +267,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 268acb14..c0a20379 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -195,7 +195,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -215,7 +215,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4e010f75..7d3d9cae 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -413,7 +413,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -433,7 +433,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 93300f3e..c94586d8 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -215,7 +215,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -236,7 +236,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmOTRS = new JMenuItem("OTRS"); mntmOTRS.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 3192da83..55074482 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -495,7 +495,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -515,7 +515,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index daec54ad..62cebb22 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -461,7 +461,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -481,7 +481,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 32110a9f..da30680c 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -415,7 +415,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -435,7 +435,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index cab588d9..67f86a13 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -410,7 +410,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -430,7 +430,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index bd69a2ac..fbbc56f3 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -452,7 +452,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -472,7 +472,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 08a68f7f..7ca24016 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -473,7 +473,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -493,7 +493,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index cd417720..d818ddeb 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -236,7 +236,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -256,7 +256,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index a8c417fa..f54b048a 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -364,7 +364,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -384,7 +384,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); -- cgit v1.2.3-55-g7522 From 4acda73b9fe642681cd7d1e60ace3bd5341f6d14 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 13 May 2014 13:50:12 +0200 Subject: FTP-Server nicht mehr hard-coded sondern ausgelesen + diverse Kleinigkeiten --- .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13159 -> 13293 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 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 1325 -> 1325 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 1327 -> 1327 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 11061 -> 11146 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12774 -> 12853 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 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 9658 -> 9658 bytes .../src/gui/image/FTPCreateUploader_GUI.java | 5 +- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 3 +- .../src/gui/image/FTPEditUploader_GUI.java | 3 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 60 ++------------------- Dozentenmodulserver/bin/server/ServerHandler.class | Bin 15199 -> 15199 bytes Dozentenmodulserver/src/server/ServerHandler.java | 3 +- 21 files changed, 11 insertions(+), 63 deletions(-) (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 505a0886..6c4219ce 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 e2be756c..2053e90e 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 b8a6fad4..bc570ca9 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 001d50ef..2aab4d53 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 d345024c..765b22bf 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 aac529c9..dbc4fc9f 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 457d19d5..2153646f 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 3a0bf56a..a39211bb 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$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 77e1a9bf..74aaef08 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index 64d6d21e..aa1b5a70 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 6311839a..910cc1d1 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/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 0f948630..780e5fd1 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 37d3827f..6ecad17e 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 50bac1aa..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 d25020ec..683a9b1a 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index f36a4c5d..6d3872a0 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -36,6 +36,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; import models.Links; +import models.SessionData; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -56,8 +57,7 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; server.User user; String filename = ""; @@ -426,6 +426,7 @@ public class FTPCreateUploader_GUI extends JFrame implements + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename() + ".vmdk"); + System.out.println("Uploading to host: "+host); task = new UploadTask(host, port, user.userName, user.password, user.path+"temp/", uploadFile); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 671b2170..1deb6cff 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -34,6 +34,7 @@ import javax.swing.JTextPane; import javax.swing.JSeparator; import models.Image; import models.Links; +import models.SessionData; import org.apache.thrift.TException; import server.Server.Client; @@ -55,7 +56,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; String downloadFile = ""; static String arg = ""; diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 3c17a3e5..6b2e0d66 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -36,6 +36,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; import models.Links; +import models.SessionData; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -55,7 +56,7 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 75320b58..ead2bd11 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -12,8 +12,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; -import java.util.UUID; - import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -91,7 +89,7 @@ public class Login_GUI extends JFrame { // Fenster darf nicht vergrößert werden setResizable(false); - + try { // Setzt das Look and Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -216,15 +214,6 @@ public class Login_GUI extends JFrame { + ", mein Token für den Satelliten " + result.authToken); - /* - // show received information - JOptionPane.showMessageDialog(null, "Freiburg liefert:" - + "\nSession-ID = " + result.sessionId + "\nToken = " - + result.authToken + "\nSatellit = " - + result.serverAddress, "Rückgabewerte aus Freiburg", - JOptionPane.INFORMATION_MESSAGE); - */ - if (login == true) { /* * @@ -253,52 +242,9 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); - /* - // show processed information - JOptionPane - .showMessageDialog( - null, - "--Werte aus Session--" - + "\nHochschule = " - + user.eMail.substring( - user.eMail.indexOf("@") + 1, - user.eMail - .indexOf( - ".", - user.eMail - .indexOf("@"))) - + "\nUsername = " - + lblusername.getText().substring( - 0, - lblusername.getText() - .indexOf("@")) - + "\nName = " - + user.lastName - + "\nVorname = " - + user.firstName - + "\nE-Mail = " - + user.eMail - + "\n\n--Werte aus gespeichertem Objekt ausgelesen--" - + "\nHochschule = " - + person.verantwortlicher - .getHochschule() - + "\nUsername = " - + person.verantwortlicher - .getUsername() - + "\nName = " - + person.verantwortlicher.getName() - + "\nVorname = " - + person.verantwortlicher - .getVorname() - + "\nE-Mail = " - + person.verantwortlicher - .getEMail(), - "Werte vergleichen", - JOptionPane.INFORMATION_MESSAGE); - */ - try { - //Lege config File an und entscheide welches Fenster als nächstes geöffnet wird + // Lege config File an und entscheide welches Fenster + // als nächstes geöffnet wird Wini ini = new Wini( new File( "C:\\Users\\" diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 7a64a1dd..052ffd4a 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 95b261d3..e9bf43a7 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -230,8 +230,7 @@ public class ServerHandler implements Server.Iface { // der übergebene Filename ist falsch - hier muss der generierte // name geholt werden, nicht der ursprüngliche name. wo wird dieser // eingelesen? - //FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" - // + tmpFile.getName())); + FileUtils.moveFile(tmpFile, new File(Configuration.config.getAbsolute_path()+"prod/"+filename)); int ret=sql.UpdateImagePath(con, filename); log.info(new Date() + " - update "+ret); -- cgit v1.2.3-55-g7522 From 32dff35f3cf3a74f62b64105fd57f7da0e2027dc Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 15 May 2014 11:17:06 +0200 Subject: Es wird nur noch eine Verbindung zum bwLehrpoolSuite Server geöffnet. --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12528 -> 12576 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 835 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 887 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9756 -> 9804 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$6.class | Bin 2125 -> 2001 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 1014 -> 890 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1351 -> 1351 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13316 -> 13362 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 1884 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 11146 -> 11192 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12853 -> 12898 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 830 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1820 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2042 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12411 -> 12459 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class | Bin 927 -> 806 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class | Bin 914 -> 793 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1796 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 835 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12192 -> 12240 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 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 9626 -> 10031 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 2326 -> 2326 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 12 ++++++------ .../src/gui/image/EditImageAllgemein_GUI.java | 8 ++++---- .../src/gui/image/FTPCreateUploader_GUI.java | 9 +++++---- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 10 +++++----- .../src/gui/image/FTPEditUploader_GUI.java | 7 ++++--- .../src/gui/image/SearchEditImage_GUI.java | 14 +++++++------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 10 +++++----- Dozentenmodul/src/gui/intro/Login_GUI.java | 11 +++++++++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 7 ++++--- .../src/gui/lecture/DeleteLecture_GUI.java | 10 +++++----- .../src/gui/lecture/EditLectureLink_GUI.java | 8 +++++--- .../src/gui/lecture/EditLectureSearch_GUI.java | 10 +++++----- .../src/gui/lecture/SearchLecture_GUI.java | 8 ++++---- Dozentenmodul/src/models/Client.java | 19 +++++++++++++++++++ Dozentenmodul/src/thrift/ThriftConnection.java | 7 ++++++- 44 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 Dozentenmodul/src/models/Client.java (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 567fc96b..09814b8a 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$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 6617ad6e..e3f2472b 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index 1a5a0fe5..4acbdfaf 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index b2656782..042234c9 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$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 94acbae9..23d60d2f 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 0081eba4..03680a6f 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$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index e20cfac9..21e46d35 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 c9ed851b..214beaa8 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 22538b35..cc06860f 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 704bd616..02cb7abd 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 2053e90e..6267c626 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.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index a39211bb..45ca0eae 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$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 74aaef08..04c8b107 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index aa1b5a70..a846427a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 910cc1d1..bde5917c 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$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 196208c4..58a8dce5 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$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index cdf3cad7..81f1d246 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 5d6c601d..61318fe0 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 7207fba7..9fabf945 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$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class index 64a6e9c9..c98d437a 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$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class index 24a37378..6c550b56 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$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class index 88e9e10c..033c3dda 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 95a953f3..245edb20 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 d7bc6bab..13b9fe67 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 780e5fd1..3f9d2221 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class index 6ecad17e..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 6db87dc2..8d8f8918 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 aff3176d..91b73e2a 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index 40003a69..290acaad 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 79e37076..9fc4110d 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -70,8 +70,8 @@ public class DeleteImage_GUI extends JFrame { JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + ThriftConnection con=new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -201,7 +201,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -250,7 +250,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -420,7 +420,7 @@ public class DeleteImage_GUI extends JFrame { // if (client.deleteImageServer(imageid // ,imageversion)) { - con.closeThriftConnection(); + DeleteImage_GUI di = new DeleteImage_GUI(); @@ -497,7 +497,7 @@ public class DeleteImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 49a97051..a3c21ddf 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -50,7 +50,7 @@ public class EditImageAllgemein_GUI extends JFrame { private JTextField EMail; private JTextField imagename; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); private JPanel panel_2; private JLabel lblNewLabel; private JTextPane txtpnBitteWhlenSie; @@ -221,7 +221,7 @@ public class EditImageAllgemein_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { // Durch den Klick auf Button Hauptmenpü wird dieses Fenster // unsichtbar und das Hauptmenü sichtbar - con.closeThriftConnection(); + EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -261,7 +261,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Setzen der Eingabe im Model, dadurch bleiben die // Daten bei einem erneuten Aufruf verfügbar // Image.image.setImagename(imagename.getText()); - con.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -288,7 +288,7 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); - con.closeThriftConnection(); + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 8c14fa01..0643728f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPCreateUploader_GUI extends JFrame implements double speed; long bytesread; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton finishButton = new JButton("Fertigstellen"); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -115,6 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -332,7 +333,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -349,7 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnZurck.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); - thrift.closeThriftConnection(); + CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI(); m.setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 1deb6cff..97a29849 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -70,8 +70,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener long bytesread; JLabel labelZeit; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zur\u00FCck"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnMainMenu = new JButton("Hauptmen\u00FC"); @@ -87,7 +87,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + con.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -355,7 +355,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Debug-Message", JOptionPane.ERROR_MESSAGE); } } - thrift.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -368,7 +368,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener btnMainMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - thrift.closeThriftConnection(); + MainMenue_GUI mm = new MainMenue_GUI(); mm.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 6b2e0d66..99fc034b 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPEditUploader_GUI extends JFrame implements long bytesread; boolean taskrun = false; int progress = 0; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); JButton finishButton = new JButton("Fertigstellen"); @@ -113,6 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -334,7 +335,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } - thrift.closeThriftConnection(); + } }); btnZurck.addActionListener(new ActionListener() { diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index b6ea90b4..ec1ceb8e 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -70,7 +70,7 @@ public class SearchEditImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchEditImage_GUI extends JFrame { SearchEditImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchEditImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -412,7 +412,7 @@ public class SearchEditImage_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + // check if user is in correct tab if (tabbedPane.getSelectedIndex() == 0) { @@ -434,7 +434,7 @@ public class SearchEditImage_GUI extends JFrame { 8).toString(); Image.image.setVersion(imageversion); - con.closeThriftConnection(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 8fc7d164..73f0b9bb 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -70,7 +70,7 @@ public class SearchImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchImage_GUI extends JFrame { SearchImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index b30a33a7..b6249be0 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -29,6 +29,7 @@ import org.apache.thrift.TException; import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.ThriftConnection; import thrift.UserInfo; import config.config_file; import javax.swing.SwingConstants; @@ -207,7 +208,13 @@ public class Login_GUI extends JFrame { SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); System.out.println("Satellit-Adresse: " + result.serverAddress); - + + //set connection to bwLehrpoolSuiteServer + ThriftConnection bwthrift=new ThriftConnection(); + server.Server.Client bwClient=bwthrift.getThriftConnection(); + models.Client.clientcon.setClient(bwClient); + + System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId @@ -240,7 +247,7 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setVorname(user.firstName); person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); - + try { // Lege config File an und entscheide welches Fenster // als nächstes geöffnet wird diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 62cebb22..610df2f3 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -68,7 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -90,6 +90,7 @@ public class CreateLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } @@ -349,7 +350,7 @@ public class CreateLectureLink_GUI extends JFrame { JButton cancelButton = new JButton("Zur\u00FCck"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI(); eVAG.setVisible(true); dispose(); @@ -420,7 +421,7 @@ public class CreateLectureLink_GUI extends JFrame { e1.getCause()+"\n"+e1.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - con.closeThriftConnection(); + dispose(); } else { diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index da30680c..33192436 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -69,7 +69,7 @@ public class DeleteLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -195,7 +195,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -210,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -350,7 +350,7 @@ public class DeleteLecture_GUI extends JFrame { if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ System.out.println("Löschen erfolgreich"); //delete successful - con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); dl.setVisible(true); dispose(); @@ -386,7 +386,7 @@ public class DeleteLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index fbbc56f3..b0f30cd9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -66,8 +66,8 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -89,6 +89,7 @@ public class EditLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } }); @@ -417,7 +418,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } - thrift.closeThriftConnection(); + + MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 7ca24016..6ce8897a 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -72,7 +72,7 @@ public class EditLectureSearch_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -196,7 +196,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -211,7 +211,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -339,7 +339,7 @@ public class EditLectureSearch_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -427,7 +427,7 @@ public class EditLectureSearch_GUI extends JFrame { Lecture.lecture.setActive(false); } - con.closeThriftConnection(); + // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index f54b048a..d686f5f9 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -68,7 +68,7 @@ public class SearchLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -192,7 +192,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -207,7 +207,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -335,7 +335,7 @@ public class SearchLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java new file mode 100644 index 00000000..6dc587f1 --- /dev/null +++ b/Dozentenmodul/src/models/Client.java @@ -0,0 +1,19 @@ +package models; + +public class Client { + + private server.Server.Client client; + + public static Client clientcon=new Client(); + + public server.Server.Client getClient() { + return client; + } + + public void setClient(server.Server.Client client) { + this.client = client; + } + + + +} diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 7652fbe7..dcd441bc 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -17,7 +17,11 @@ public class ThriftConnection { private String satAddress = ""+SessionData.session.getServerAdress(); final TTransport transport = new TSocket(satAddress, 9090); - //final TTransport transport = new TSocket("141.79.128.102", 9090); + + public ThriftConnection() { + // TODO Auto-generated constructor stub + } + public Client getThriftConnection() { @@ -34,6 +38,7 @@ public class ThriftConnection { } final TProtocol protocol = new TBinaryProtocol(transport); + final Server.Client client = new Server.Client(protocol); System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); -- cgit v1.2.3-55-g7522