From 5c80c56cbcdd3dc677f743b0bf8a8de6a504218b Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 21 Mar 2014 13:23:25 +0100 Subject: SQL Abfragen auf ID und Version umgestellt --- Dozentenmodul/src/Models/Image.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index 2a8c4fcd..cdc8264c 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -1,6 +1,9 @@ package models; public class Image { + private String ImageId; + private String version; + private String imagename; private String newName; private boolean licensed; @@ -46,4 +49,16 @@ public class Image { public void setNewName(String newName) { this.newName = newName; } + public String getImageId() { + return ImageId; + } + public void setImageId(String imageId) { + ImageId = imageId; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } } -- cgit v1.2.3-55-g7522 From 9464f7fc790cf54760b247681c4cd6417ff8a995 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Mar 2014 11:53:38 +0100 Subject: Authentifizierung über Masterserver funktioniert nun --- Dozentenmodul/.classpath | 1 + Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 2392 -> 4049 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 3731 -> 3947 bytes Dozentenmodul/bin/thrift/AuthenticationError.class | Bin 0 -> 1583 bytes ...ion$AuthenticationExceptionStandardScheme.class | Bin 0 -> 2988 bytes ...henticationExceptionStandardSchemeFactory.class | Bin 0 -> 1157 bytes ...eption$AuthenticationExceptionTupleScheme.class | Bin 0 -> 2442 bytes ...AuthenticationExceptionTupleSchemeFactory.class | Bin 0 -> 1133 bytes .../thrift/AuthenticationException$_Fields.class | Bin 0 -> 3046 bytes .../bin/thrift/AuthenticationException.class | Bin 0 -> 11125 bytes Dozentenmodul/bin/thrift/AuthorizationError.class | Bin 0 -> 1494 bytes ...tion$AuthorizationExceptionStandardScheme.class | Bin 0 -> 2973 bytes ...thorizationExceptionStandardSchemeFactory.class | Bin 0 -> 1141 bytes ...ception$AuthorizationExceptionTupleScheme.class | Bin 0 -> 2427 bytes ...$AuthorizationExceptionTupleSchemeFactory.class | Bin 0 -> 1117 bytes .../thrift/AuthorizationException$_Fields.class | Bin 0 -> 3036 bytes .../bin/thrift/AuthorizationException.class | Bin 0 -> 11081 bytes .../thrift/ImageServer$AsyncClient$Factory.class | Bin 0 -> 1477 bytes ...ImageServer$AsyncClient$authenticate_call.class | Bin 0 -> 3336 bytes ...eServer$AsyncClient$getUserFromToken_call.class | Bin 0 -> 3257 bytes .../thrift/ImageServer$AsyncClient$ping_call.class | Bin 0 -> 2925 bytes .../bin/thrift/ImageServer$AsyncClient.class | Bin 0 -> 3081 bytes .../bin/thrift/ImageServer$AsyncIface.class | Bin 0 -> 538 bytes ...ImageServer$AsyncProcessor$authenticate$1.class | Bin 0 -> 3150 bytes .../ImageServer$AsyncProcessor$authenticate.class | Bin 0 -> 3247 bytes ...eServer$AsyncProcessor$getUserFromToken$1.class | Bin 0 -> 3170 bytes ...ageServer$AsyncProcessor$getUserFromToken.class | Bin 0 -> 3241 bytes .../thrift/ImageServer$AsyncProcessor$ping$1.class | Bin 0 -> 2953 bytes .../thrift/ImageServer$AsyncProcessor$ping.class | Bin 0 -> 3032 bytes .../bin/thrift/ImageServer$AsyncProcessor.class | Bin 0 -> 2446 bytes .../bin/thrift/ImageServer$Client$Factory.class | Bin 0 -> 1451 bytes Dozentenmodul/bin/thrift/ImageServer$Client.class | Bin 0 -> 3970 bytes Dozentenmodul/bin/thrift/ImageServer$Iface.class | Bin 0 -> 502 bytes .../ImageServer$Processor$authenticate.class | Bin 0 -> 2329 bytes .../ImageServer$Processor$getUserFromToken.class | Bin 0 -> 2337 bytes .../bin/thrift/ImageServer$Processor$ping.class | Bin 0 -> 1919 bytes .../bin/thrift/ImageServer$Processor.class | Bin 0 -> 2324 bytes .../ImageServer$authenticate_args$_Fields.class | Bin 0 -> 3142 bytes ...cate_args$authenticate_argsStandardScheme.class | Bin 0 -> 2850 bytes ...gs$authenticate_argsStandardSchemeFactory.class | Bin 0 -> 1191 bytes ...nticate_args$authenticate_argsTupleScheme.class | Bin 0 -> 2314 bytes ..._args$authenticate_argsTupleSchemeFactory.class | Bin 0 -> 1167 bytes .../bin/thrift/ImageServer$authenticate_args.class | Bin 0 -> 10868 bytes .../ImageServer$authenticate_result$_Fields.class | Bin 0 -> 3158 bytes ..._result$authenticate_resultStandardScheme.class | Bin 0 -> 2987 bytes ...$authenticate_resultStandardSchemeFactory.class | Bin 0 -> 1223 bytes ...ate_result$authenticate_resultTupleScheme.class | Bin 0 -> 2449 bytes ...ult$authenticate_resultTupleSchemeFactory.class | Bin 0 -> 1199 bytes .../thrift/ImageServer$authenticate_result.class | Bin 0 -> 11542 bytes ...ImageServer$getUserFromToken_args$_Fields.class | Bin 0 -> 3091 bytes ..._args$getUserFromToken_argsStandardScheme.class | Bin 0 -> 2711 bytes ...etUserFromToken_argsStandardSchemeFactory.class | Bin 0 -> 1255 bytes ...ken_args$getUserFromToken_argsTupleScheme.class | Bin 0 -> 2196 bytes ...s$getUserFromToken_argsTupleSchemeFactory.class | Bin 0 -> 1231 bytes .../thrift/ImageServer$getUserFromToken_args.class | Bin 0 -> 9748 bytes ...ageServer$getUserFromToken_result$_Fields.class | Bin 0 -> 3198 bytes ...ult$getUserFromToken_resultStandardScheme.class | Bin 0 -> 3025 bytes ...UserFromToken_resultStandardSchemeFactory.class | Bin 0 -> 1287 bytes ...result$getUserFromToken_resultTupleScheme.class | Bin 0 -> 2487 bytes ...getUserFromToken_resultTupleSchemeFactory.class | Bin 0 -> 1263 bytes .../ImageServer$getUserFromToken_result.class | Bin 0 -> 11659 bytes .../bin/thrift/ImageServer$ping_args$_Fields.class | Bin 0 -> 2863 bytes ...eServer$ping_args$ping_argsStandardScheme.class | Bin 0 -> 2150 bytes ...$ping_args$ping_argsStandardSchemeFactory.class | Bin 0 -> 1063 bytes ...mageServer$ping_args$ping_argsTupleScheme.class | Bin 0 -> 1460 bytes ...ver$ping_args$ping_argsTupleSchemeFactory.class | Bin 0 -> 1039 bytes .../bin/thrift/ImageServer$ping_args.class | Bin 0 -> 7314 bytes .../thrift/ImageServer$ping_result$_Fields.class | Bin 0 -> 2995 bytes ...ver$ping_result$ping_resultStandardScheme.class | Bin 0 -> 2557 bytes ...g_result$ping_resultStandardSchemeFactory.class | Bin 0 -> 1095 bytes ...Server$ping_result$ping_resultTupleScheme.class | Bin 0 -> 2014 bytes ...ping_result$ping_resultTupleSchemeFactory.class | Bin 0 -> 1071 bytes .../bin/thrift/ImageServer$ping_result.class | Bin 0 -> 9526 bytes Dozentenmodul/bin/thrift/ImageServer.class | Bin 0 -> 1037 bytes ...ption$InvalidTokenExceptionStandardScheme.class | Bin 0 -> 2164 bytes ...nvalidTokenExceptionStandardSchemeFactory.class | Bin 0 -> 1125 bytes ...xception$InvalidTokenExceptionTupleScheme.class | Bin 0 -> 1474 bytes ...n$InvalidTokenExceptionTupleSchemeFactory.class | Bin 0 -> 1101 bytes .../bin/thrift/InvalidTokenException$_Fields.class | Bin 0 -> 2829 bytes .../bin/thrift/InvalidTokenException.class | Bin 0 -> 7448 bytes .../bin/thrift/MasterThriftConnection.class | Bin 0 -> 1576 bytes .../SessionData$SessionDataStandardScheme.class | Bin 0 -> 2652 bytes ...sionData$SessionDataStandardSchemeFactory.class | Bin 0 -> 965 bytes .../SessionData$SessionDataTupleScheme.class | Bin 0 -> 2118 bytes ...SessionData$SessionDataTupleSchemeFactory.class | Bin 0 -> 941 bytes Dozentenmodul/bin/thrift/SessionData$_Fields.class | Bin 0 -> 2934 bytes Dozentenmodul/bin/thrift/SessionData.class | Bin 0 -> 10381 bytes .../thrift/UserInfo$UserInfoStandardScheme.class | Bin 0 -> 2967 bytes .../UserInfo$UserInfoStandardSchemeFactory.class | Bin 0 -> 917 bytes .../bin/thrift/UserInfo$UserInfoTupleScheme.class | Bin 0 -> 2378 bytes .../UserInfo$UserInfoTupleSchemeFactory.class | Bin 0 -> 893 bytes Dozentenmodul/bin/thrift/UserInfo$_Fields.class | Bin 0 -> 3064 bytes Dozentenmodul/bin/thrift/UserInfo.class | Bin 0 -> 12630 bytes Dozentenmodul/src/GUI/SearchImage_GUI.java | 906 +++--- Dozentenmodul/src/Models/person.java | 124 +- Dozentenmodul/src/Models/vm.java | 138 +- Dozentenmodul/src/gui/Login_GUI.java | 27 + Dozentenmodul/src/thrift/AuthenticationError.java | 51 + .../src/thrift/AuthenticationException.java | 504 ++++ Dozentenmodul/src/thrift/AuthorizationError.java | 48 + .../src/thrift/AuthorizationException.java | 504 ++++ Dozentenmodul/src/thrift/ImageServer.java | 2871 ++++++++++++++++++++ .../src/thrift/InvalidTokenException.java | 280 ++ .../src/thrift/MasterThriftConnection.java | 38 + Dozentenmodul/src/thrift/SessionData.java | 488 ++++ Dozentenmodul/src/thrift/UserInfo.java | 688 +++++ 108 files changed, 6084 insertions(+), 584 deletions(-) create mode 100644 Dozentenmodul/bin/thrift/AuthenticationError.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/AuthenticationException.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationError.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/AuthorizationException.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncClient$Factory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncClient$authenticate_call.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncClient$getUserFromToken_call.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncClient$ping_call.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncClient.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncIface.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate$1.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken$1.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping$1.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Client$Factory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Client.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Iface.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Processor$authenticate.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Processor$getUserFromToken.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Processor$ping.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$Processor.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_args.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$authenticate_result.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_args.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer$ping_result.class create mode 100644 Dozentenmodul/bin/thrift/ImageServer.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/InvalidTokenException.class create mode 100644 Dozentenmodul/bin/thrift/MasterThriftConnection.class create mode 100644 Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/SessionData$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/SessionData.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardScheme.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleScheme.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleSchemeFactory.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo$_Fields.class create mode 100644 Dozentenmodul/bin/thrift/UserInfo.class create mode 100644 Dozentenmodul/src/thrift/AuthenticationError.java create mode 100644 Dozentenmodul/src/thrift/AuthenticationException.java create mode 100644 Dozentenmodul/src/thrift/AuthorizationError.java create mode 100644 Dozentenmodul/src/thrift/AuthorizationException.java create mode 100644 Dozentenmodul/src/thrift/ImageServer.java create mode 100644 Dozentenmodul/src/thrift/InvalidTokenException.java create mode 100644 Dozentenmodul/src/thrift/MasterThriftConnection.java create mode 100644 Dozentenmodul/src/thrift/SessionData.java create mode 100644 Dozentenmodul/src/thrift/UserInfo.java (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath index 459c978e..d012956c 100644 --- a/Dozentenmodul/.classpath +++ b/Dozentenmodul/.classpath @@ -17,5 +17,6 @@ + diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index 3ba048a4..415f2233 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index 4c73519c..6a03ae8e 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index 9d555d1d..d617ce42 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index 621e1e3f..bc297a50 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationError.class b/Dozentenmodul/bin/thrift/AuthenticationError.class new file mode 100644 index 00000000..8f12237d Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationError.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardScheme.class b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardScheme.class new file mode 100644 index 00000000..6108caf6 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardSchemeFactory.class new file mode 100644 index 00000000..ed3b0b62 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleScheme.class b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleScheme.class new file mode 100644 index 00000000..2ae1e4f8 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleSchemeFactory.class new file mode 100644 index 00000000..662f2f37 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException$AuthenticationExceptionTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException$_Fields.class b/Dozentenmodul/bin/thrift/AuthenticationException$_Fields.class new file mode 100644 index 00000000..21b0acfc Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/AuthenticationException.class b/Dozentenmodul/bin/thrift/AuthenticationException.class new file mode 100644 index 00000000..de2ec118 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthenticationException.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationError.class b/Dozentenmodul/bin/thrift/AuthorizationError.class new file mode 100644 index 00000000..b05d13c5 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationError.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardScheme.class b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardScheme.class new file mode 100644 index 00000000..978243e1 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardSchemeFactory.class new file mode 100644 index 00000000..9186486d Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleScheme.class b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleScheme.class new file mode 100644 index 00000000..7b0fcbe6 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleSchemeFactory.class new file mode 100644 index 00000000..40ca68dc Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException$AuthorizationExceptionTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException$_Fields.class b/Dozentenmodul/bin/thrift/AuthorizationException$_Fields.class new file mode 100644 index 00000000..ff62ea72 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/AuthorizationException.class b/Dozentenmodul/bin/thrift/AuthorizationException.class new file mode 100644 index 00000000..9ec46927 Binary files /dev/null and b/Dozentenmodul/bin/thrift/AuthorizationException.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$Factory.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$Factory.class new file mode 100644 index 00000000..c7f71131 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$Factory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$authenticate_call.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$authenticate_call.class new file mode 100644 index 00000000..fb117af1 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$authenticate_call.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$getUserFromToken_call.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$getUserFromToken_call.class new file mode 100644 index 00000000..43a434ad Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$getUserFromToken_call.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$ping_call.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$ping_call.class new file mode 100644 index 00000000..6ebc2ea3 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient$ping_call.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncClient.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient.class new file mode 100644 index 00000000..1d34c1e2 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncClient.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncIface.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncIface.class new file mode 100644 index 00000000..e28e8f90 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncIface.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate$1.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate$1.class new file mode 100644 index 00000000..3dadf0b7 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate$1.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate.class new file mode 100644 index 00000000..a02237d2 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$authenticate.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken$1.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken$1.class new file mode 100644 index 00000000..8bd8bacf Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken$1.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken.class new file mode 100644 index 00000000..2b4fe03d Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$getUserFromToken.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping$1.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping$1.class new file mode 100644 index 00000000..9dc81f2a Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping$1.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping.class new file mode 100644 index 00000000..4b4e0afe Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor$ping.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor.class b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor.class new file mode 100644 index 00000000..9bd05794 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$AsyncProcessor.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Client$Factory.class b/Dozentenmodul/bin/thrift/ImageServer$Client$Factory.class new file mode 100644 index 00000000..215621f5 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Client$Factory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Client.class b/Dozentenmodul/bin/thrift/ImageServer$Client.class new file mode 100644 index 00000000..d8ecb8b8 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Client.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Iface.class b/Dozentenmodul/bin/thrift/ImageServer$Iface.class new file mode 100644 index 00000000..18aec242 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Iface.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Processor$authenticate.class b/Dozentenmodul/bin/thrift/ImageServer$Processor$authenticate.class new file mode 100644 index 00000000..1a1f939e Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Processor$authenticate.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Processor$getUserFromToken.class b/Dozentenmodul/bin/thrift/ImageServer$Processor$getUserFromToken.class new file mode 100644 index 00000000..eba9943e Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Processor$getUserFromToken.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Processor$ping.class b/Dozentenmodul/bin/thrift/ImageServer$Processor$ping.class new file mode 100644 index 00000000..a3dd6c8f Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Processor$ping.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$Processor.class b/Dozentenmodul/bin/thrift/ImageServer$Processor.class new file mode 100644 index 00000000..26f96272 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$Processor.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$_Fields.class new file mode 100644 index 00000000..a8cd4f66 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardScheme.class new file mode 100644 index 00000000..29e03256 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardSchemeFactory.class new file mode 100644 index 00000000..d20ee8b2 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleScheme.class new file mode 100644 index 00000000..58d1374e Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleSchemeFactory.class new file mode 100644 index 00000000..4429e284 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_args.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args.class new file mode 100644 index 00000000..a92fb3e9 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_args.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$_Fields.class new file mode 100644 index 00000000..9fcb0a6e Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardScheme.class new file mode 100644 index 00000000..b1243414 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardSchemeFactory.class new file mode 100644 index 00000000..1c507ea2 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleScheme.class new file mode 100644 index 00000000..4a3edda6 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleSchemeFactory.class new file mode 100644 index 00000000..c82d6354 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result$authenticate_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$authenticate_result.class b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result.class new file mode 100644 index 00000000..db12a9f8 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$authenticate_result.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$_Fields.class new file mode 100644 index 00000000..ad982267 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardScheme.class new file mode 100644 index 00000000..9b24fe8f Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardSchemeFactory.class new file mode 100644 index 00000000..8bac7772 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleScheme.class new file mode 100644 index 00000000..94eb7a5d Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleSchemeFactory.class new file mode 100644 index 00000000..13e77c2b Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args$getUserFromToken_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args.class new file mode 100644 index 00000000..90aa2fa1 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_args.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$_Fields.class new file mode 100644 index 00000000..f306cf9d Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardScheme.class new file mode 100644 index 00000000..8ce44766 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardSchemeFactory.class new file mode 100644 index 00000000..9cb117e7 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleScheme.class new file mode 100644 index 00000000..e9186710 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleSchemeFactory.class new file mode 100644 index 00000000..1ba83391 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result$getUserFromToken_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result.class b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result.class new file mode 100644 index 00000000..bc1a176b Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$getUserFromToken_result.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args$_Fields.class new file mode 100644 index 00000000..af0bbe88 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardScheme.class new file mode 100644 index 00000000..2c2f59cf Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardSchemeFactory.class new file mode 100644 index 00000000..6fc626ef Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleScheme.class new file mode 100644 index 00000000..822afb2c Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleSchemeFactory.class new file mode 100644 index 00000000..7b2dc61c Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args$ping_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_args.class b/Dozentenmodul/bin/thrift/ImageServer$ping_args.class new file mode 100644 index 00000000..72a484fb Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_args.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result$_Fields.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result$_Fields.class new file mode 100644 index 00000000..6af85a25 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardScheme.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardScheme.class new file mode 100644 index 00000000..311b5c76 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardSchemeFactory.class new file mode 100644 index 00000000..77ed53ce Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleScheme.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleScheme.class new file mode 100644 index 00000000..eb11e143 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleSchemeFactory.class new file mode 100644 index 00000000..95803bc3 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result$ping_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer$ping_result.class b/Dozentenmodul/bin/thrift/ImageServer$ping_result.class new file mode 100644 index 00000000..eb20bac5 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer$ping_result.class differ diff --git a/Dozentenmodul/bin/thrift/ImageServer.class b/Dozentenmodul/bin/thrift/ImageServer.class new file mode 100644 index 00000000..414f9a34 Binary files /dev/null and b/Dozentenmodul/bin/thrift/ImageServer.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardScheme.class b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardScheme.class new file mode 100644 index 00000000..8336b756 Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardSchemeFactory.class new file mode 100644 index 00000000..603e663a Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleScheme.class b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleScheme.class new file mode 100644 index 00000000..cbce816c Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleSchemeFactory.class new file mode 100644 index 00000000..0286db6c Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException$InvalidTokenExceptionTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException$_Fields.class b/Dozentenmodul/bin/thrift/InvalidTokenException$_Fields.class new file mode 100644 index 00000000..a93a93a8 Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/InvalidTokenException.class b/Dozentenmodul/bin/thrift/InvalidTokenException.class new file mode 100644 index 00000000..317b760c Binary files /dev/null and b/Dozentenmodul/bin/thrift/InvalidTokenException.class differ diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class new file mode 100644 index 00000000..dd76a766 Binary files /dev/null and b/Dozentenmodul/bin/thrift/MasterThriftConnection.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class new file mode 100644 index 00000000..f7b6f6b6 Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class new file mode 100644 index 00000000..245e7cdc Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData$SessionDataStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class new file mode 100644 index 00000000..9c968929 Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class new file mode 100644 index 00000000..2c83a82f Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData$SessionDataTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData$_Fields.class b/Dozentenmodul/bin/thrift/SessionData$_Fields.class new file mode 100644 index 00000000..13a9da4f Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/SessionData.class b/Dozentenmodul/bin/thrift/SessionData.class new file mode 100644 index 00000000..f8597a01 Binary files /dev/null and b/Dozentenmodul/bin/thrift/SessionData.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardScheme.class b/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardScheme.class new file mode 100644 index 00000000..c4a055f7 Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardScheme.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardSchemeFactory.class b/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardSchemeFactory.class new file mode 100644 index 00000000..ff60ded1 Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo$UserInfoStandardSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleScheme.class b/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleScheme.class new file mode 100644 index 00000000..1d717010 Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleScheme.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleSchemeFactory.class b/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleSchemeFactory.class new file mode 100644 index 00000000..adf2a51e Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo$UserInfoTupleSchemeFactory.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo$_Fields.class b/Dozentenmodul/bin/thrift/UserInfo$_Fields.class new file mode 100644 index 00000000..3bff9fe0 Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo$_Fields.class differ diff --git a/Dozentenmodul/bin/thrift/UserInfo.class b/Dozentenmodul/bin/thrift/UserInfo.class new file mode 100644 index 00000000..ed7e6f12 Binary files /dev/null and b/Dozentenmodul/bin/thrift/UserInfo.class differ diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java index ad474768..4225a295 100644 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java @@ -1,453 +1,453 @@ -package gui; - - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.SystemColor; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Iterator; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableModel; -import javax.swing.table.TableRowSorter; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class SearchImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); - final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); - final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchImage_GUI dialog = new SearchImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X - System.exit(0); - } - }); - //Verhindert das Vergrößern Des Fensters - setResizable(false); - - try { - //Setzt das Look & Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - - - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); - lblNewLabel.setBounds(10, 11, 509, 22); - panel.add(lblNewLabel); - lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); - } - - JTextPane txtpnBitteWhlenSie = new JTextPane(); - txtpnBitteWhlenSie.setEditable(false); - txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 531); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JPanel panel_1 = new JPanel(); - panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 49, 557, 131); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - textFieldName = new JTextField(); - //Key Listener der Tastatureingabe registriert - textFieldName.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - //Textfield eingabe auslesen - String stext=textFieldName.getText(); - - //Wenn Textfield nicht leer - if(stext!="") - { - //Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); - - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list=client.getAllOS(); - //Leeres Item hinzufügen - comboBox.addItem(""); - for(int i=0;i"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - - - } - else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); - //rowSorterMyImages.toggleSortOrder(0); - } - - } - }); - - tabbedPane.setBounds(10, 197, 557, 300); - contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); - initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); - - JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages=new JTable(); - tableAllImages.setModel(modelAll); - tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - initTableModel(modelAll); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); - tableCoopImages.setModel(model); - tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages=new JTable(); - tablePublicImages.setModel(model); - tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); - tabbedPane.setEnabledAt(3, false); - - JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable tablePublicVorlagen=new JTable(); - tablePublicVorlagen.setModel(model); - tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); - - scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); - tabbedPane.setEnabledAt(4, false); - - - - - JButton btnDownload = new JButton("Download"); - btnDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); - down.setVisible(true); - SearchImage_GUI.this.setVisible(false); - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 78, 597, 2); - getContentPane().add(separator); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - getContentPane().add(separator_1); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - menuBar.add(mnNewMenu_1); - - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnNewMenu_1.add(mntmFaq); - - JMenuItem mntmOtrs = new JMenuItem("OTRS"); - mnNewMenu_1.add(mntmOtrs); - - } - //Initiale Beffülung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model){ - List images; - try { - //Hole eine Liste der Images - - images = client.getImageList(); - Iterator i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; - //Füge diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); - - } - - return model; - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return model; - } - - } - - +package gui; + + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Iterator; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.RowFilter; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + JTable tablemyImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; + ThriftConnection con=new ThriftConnection(); + Client client=con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); + final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); + final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); + final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + SearchImage_GUI dialog = new SearchImage_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchImage_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung nach klick auf X + System.exit(0); + } + }); + //Verhindert das Vergrößern Des Fensters + setResizable(false); + + try { + //Setzt das Look & Feel auf System + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp*"); + //Zentriert das Fenster in die Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + + + final DefaultTableModel model = new DefaultTableModel( titles, 0 ); + + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 49, 557, 131); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + textFieldName = new JTextField(); + //Key Listener der Tastatureingabe registriert + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + //Textfield eingabe auslesen + String stext=textFieldName.getText(); + + //Wenn Textfield nicht leer + if(stext!="") + { + //Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); + + } + }}); + + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Öffnet das Fenster Extended GUI + ExtendedSearch_GUI es=new ExtendedSearch_GUI(); + es.setVisible(true); + } + }); + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + comboBox = new JComboBox(); + try { + //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List list=client.getAllOS(); + //Leeres Item hinzufügen + comboBox.addItem(""); + for(int i=0;i"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); + lblNewLabel_1.setBounds(146, 11, 85, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + System.out.println(tabbedPane.getSelectedIndex()); + if(tabbedPane.getSelectedIndex()==0){ + + + + } + else if(tabbedPane.getSelectedIndex()==1){ + String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + //rowSorterMyImages.toggleSortOrder(0); + } + + } + }); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages=new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelMyImages); + tablemyImages.setRowSorter(rowSorterMyImages); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllImages=new JTable(); + tableAllImages.setModel(modelAll); + tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); + initTableModel(modelAll); + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages=new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable tablePublicImages=new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + JTable tablePublicVorlagen=new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + + + + + JButton btnDownload = new JButton("Download"); + btnDownload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + //Öffnet den Downloader + FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); + down.setVisible(true); + SearchImage_GUI.this.setVisible(false); + } + }); + btnDownload.setBounds(449, 508, 118, 23); + contentPanel.add(btnDownload); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //Öffnet das Hauptmenü + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + } + //Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model){ + List images; + try { + //Hole eine Liste der Images + + images = client.getImageList(); + Iterator i=images.iterator(); + + int x=0; + + while(i.hasNext()) + { + //erzeuge Objekte für die Tabelle + Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; + //Füge diese Objekte der Tabelle hinzu + model.addRow(obj); + x++; + i.next(); + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + + } + + diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index c106ec12..f4dd5c22 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -1,62 +1,62 @@ -package models; - - -public class person{ - - private String Name; - private String Vorname; - private String Hochschule; - private String EMail; - private String Tel; - private String Fakultät; - private boolean ischecked; - - - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); - - public String getName() { - return Name; - } - public void setName(String name) { - Name = name; - } - public String getVorname() { - return Vorname; - } - public void setVorname(String vorname) { - Vorname = vorname; - } - public String getHochschule() { - return Hochschule; - } - public void setHochschule(String hochschule) { - Hochschule = hochschule; - } - public String getEMail() { - return EMail; - } - public void setEMail(String eMail) { - EMail = eMail; - } - public String getTel() { - return Tel; - } - public void setTel(String tel) { - Tel = tel; - } - public String getFakultät() { - return Fakultät; - } - public void setFakultät(String fakultät) { - Fakultät = fakultät; - } - public boolean isIschecked() { - return ischecked; - } - public void setIschecked(boolean ischecked) { - this.ischecked = ischecked; - } - - -} +package models; + + +public class person{ + + private String Name; + private String Vorname; + private String Hochschule; + private String EMail; + private String Tel; + private String Fakultät; + private boolean ischecked; + + + public static person verantowrtlicher=new person(); + public static person ersteller=new person(); + + public String getName() { + return Name; + } + public void setName(String name) { + Name = name; + } + public String getVorname() { + return Vorname; + } + public void setVorname(String vorname) { + Vorname = vorname; + } + public String getHochschule() { + return Hochschule; + } + public void setHochschule(String hochschule) { + Hochschule = hochschule; + } + public String getEMail() { + return EMail; + } + public void setEMail(String eMail) { + EMail = eMail; + } + public String getTel() { + return Tel; + } + public void setTel(String tel) { + Tel = tel; + } + public String getFakultät() { + return Fakultät; + } + public void setFakultät(String fakultät) { + Fakultät = fakultät; + } + public boolean isIschecked() { + return ischecked; + } + public void setIschecked(boolean ischecked) { + this.ischecked = ischecked; + } + + +} diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java index 07074cf9..34f9ffaa 100644 --- a/Dozentenmodul/src/Models/vm.java +++ b/Dozentenmodul/src/Models/vm.java @@ -1,69 +1,69 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} +package models; + +import java.awt.List; +import java.util.Date; + + +public class vm { + + private String Laborname; + private String shortDesc; + private String longDesc; + private String comment; + private String OS; + private Date begin; + private Date end; + private List software; + + public static vm vl=new vm(); + public String getLaborname() { + return Laborname; + } + public void setLaborname(String laborname) { + Laborname = laborname; + } + public String getShortDesc() { + return shortDesc; + } + public void setShortDesc(String shortDesc) { + this.shortDesc = shortDesc; + } + public String getLongDesc() { + return longDesc; + } + public void setLongDesc(String longDesc) { + this.longDesc = longDesc; + } + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } + public String getOS() { + return OS; + } + public void setOS(String oS) { + OS = oS; + } + public Date getBegin() { + return begin; + } + public void setBegin(Date begin) { + this.begin = begin; + } + public Date getEnd() { + return end; + } + public void setEnd(Date end) { + this.end = end; + } + public List getSoftware() { + return software; + } + public void setSoftware(List software) { + this.software = software; + } + + +} diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index cc558261..58d1d104 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -27,7 +27,15 @@ import javax.swing.border.EmptyBorder; import models.person; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; import org.ini4j.Wini; +import thrift.AuthenticationException; +import thrift.ImageServer; +import thrift.SessionData; +import thrift.MasterThriftConnection; +import thrift.ImageServer.Client; import config.config_file; @@ -145,6 +153,25 @@ public class Login_GUI extends JFrame { //Ldap check=new Ldap(); boolean login=true; //boolean login=check.LdapAuth(username.getText(), new String(pass.getPassword())); + MasterThriftConnection thrift=new MasterThriftConnection(); + Client client=thrift.getMasterThriftConnection(); + String token=null; + final thrift.SessionData result; + try { + String passText = new String(pass.getPassword()); + System.out.println(username.getText()+" "+passText); + result = client.authenticate(username.getText(), passText); + } catch (thrift.AuthenticationException e) { + System.out.println("Authentifizierung fehlgeschlagen: " + + e.message); + return; + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return; + } + System.out.println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId + ", mein Token für den Satelliten " + result.authToken); + token = result.authToken; if(login==true) { diff --git a/Dozentenmodul/src/thrift/AuthenticationError.java b/Dozentenmodul/src/thrift/AuthenticationError.java new file mode 100644 index 00000000..7d543832 --- /dev/null +++ b/Dozentenmodul/src/thrift/AuthenticationError.java @@ -0,0 +1,51 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + + +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + +public enum AuthenticationError implements org.apache.thrift.TEnum { + GENERIC_ERROR(0), + INVALID_CREDENTIALS(1), + ACCOUNT_SUSPENDED(2), + BANNED_NETWORK(3); + + private final int value; + + private AuthenticationError(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static AuthenticationError findByValue(int value) { + switch (value) { + case 0: + return GENERIC_ERROR; + case 1: + return INVALID_CREDENTIALS; + case 2: + return ACCOUNT_SUSPENDED; + case 3: + return BANNED_NETWORK; + default: + return null; + } + } +} diff --git a/Dozentenmodul/src/thrift/AuthenticationException.java b/Dozentenmodul/src/thrift/AuthenticationException.java new file mode 100644 index 00000000..d416cacf --- /dev/null +++ b/Dozentenmodul/src/thrift/AuthenticationException.java @@ -0,0 +1,504 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AuthenticationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException"); + + private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new AuthenticationExceptionStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AuthenticationExceptionTupleSchemeFactory()); + } + + /** + * + * @see AuthenticationError + */ + public AuthenticationError number; // required + public String message; // 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 { + /** + * + * @see AuthenticationError + */ + NUMBER((short)1, "number"), + MESSAGE((short)2, "message"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // NUMBER + return NUMBER; + case 2: // MESSAGE + return MESSAGE; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NUMBER, new org.apache.thrift.meta_data.FieldMetaData("number", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AuthenticationError.class))); + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthenticationException.class, metaDataMap); + } + + public AuthenticationException() { + } + + public AuthenticationException( + AuthenticationError number, + String message) + { + this(); + this.number = number; + this.message = message; + } + + /** + * Performs a deep copy on other. + */ + public AuthenticationException(AuthenticationException other) { + if (other.isSetNumber()) { + this.number = other.number; + } + if (other.isSetMessage()) { + this.message = other.message; + } + } + + public AuthenticationException deepCopy() { + return new AuthenticationException(this); + } + + @Override + public void clear() { + this.number = null; + this.message = null; + } + + /** + * + * @see AuthenticationError + */ + public AuthenticationError getNumber() { + return this.number; + } + + /** + * + * @see AuthenticationError + */ + public AuthenticationException setNumber(AuthenticationError number) { + this.number = number; + return this; + } + + public void unsetNumber() { + this.number = null; + } + + /** Returns true if field number is set (has been assigned a value) and false otherwise */ + public boolean isSetNumber() { + return this.number != null; + } + + public void setNumberIsSet(boolean value) { + if (!value) { + this.number = null; + } + } + + public String getMessage() { + return this.message; + } + + public AuthenticationException setMessage(String message) { + this.message = message; + return this; + } + + public void unsetMessage() { + this.message = null; + } + + /** Returns true if field message is set (has been assigned a value) and false otherwise */ + public boolean isSetMessage() { + return this.message != null; + } + + public void setMessageIsSet(boolean value) { + if (!value) { + this.message = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case NUMBER: + if (value == null) { + unsetNumber(); + } else { + setNumber((AuthenticationError)value); + } + break; + + case MESSAGE: + if (value == null) { + unsetMessage(); + } else { + setMessage((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case NUMBER: + return getNumber(); + + case MESSAGE: + return getMessage(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case NUMBER: + return isSetNumber(); + case MESSAGE: + return isSetMessage(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof AuthenticationException) + return this.equals((AuthenticationException)that); + return false; + } + + public boolean equals(AuthenticationException that) { + if (that == null) + return false; + + boolean this_present_number = true && this.isSetNumber(); + boolean that_present_number = true && that.isSetNumber(); + if (this_present_number || that_present_number) { + if (!(this_present_number && that_present_number)) + return false; + if (!this.number.equals(that.number)) + return false; + } + + boolean this_present_message = true && this.isSetMessage(); + boolean that_present_message = true && that.isSetMessage(); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(AuthenticationException other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNumber()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetMessage()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("AuthenticationException("); + boolean first = true; + + sb.append("number:"); + if (this.number == null) { + sb.append("null"); + } else { + sb.append(this.number); + } + first = false; + if (!first) sb.append(", "); + sb.append("message:"); + if (this.message == null) { + sb.append("null"); + } else { + sb.append(this.message); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class AuthenticationExceptionStandardSchemeFactory implements SchemeFactory { + public AuthenticationExceptionStandardScheme getScheme() { + return new AuthenticationExceptionStandardScheme(); + } + } + + private static class AuthenticationExceptionStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, AuthenticationException struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // NUMBER + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.number = AuthenticationError.findByValue(iprot.readI32()); + struct.setNumberIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // MESSAGE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.message = iprot.readString(); + struct.setMessageIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, AuthenticationException struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.number != null) { + oprot.writeFieldBegin(NUMBER_FIELD_DESC); + oprot.writeI32(struct.number.getValue()); + oprot.writeFieldEnd(); + } + if (struct.message != null) { + oprot.writeFieldBegin(MESSAGE_FIELD_DESC); + oprot.writeString(struct.message); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class AuthenticationExceptionTupleSchemeFactory implements SchemeFactory { + public AuthenticationExceptionTupleScheme getScheme() { + return new AuthenticationExceptionTupleScheme(); + } + } + + private static class AuthenticationExceptionTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, AuthenticationException struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetNumber()) { + optionals.set(0); + } + if (struct.isSetMessage()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetNumber()) { + oprot.writeI32(struct.number.getValue()); + } + if (struct.isSetMessage()) { + oprot.writeString(struct.message); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, AuthenticationException struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.number = AuthenticationError.findByValue(iprot.readI32()); + struct.setNumberIsSet(true); + } + if (incoming.get(1)) { + struct.message = iprot.readString(); + struct.setMessageIsSet(true); + } + } + } + +} + diff --git a/Dozentenmodul/src/thrift/AuthorizationError.java b/Dozentenmodul/src/thrift/AuthorizationError.java new file mode 100644 index 00000000..443be4f4 --- /dev/null +++ b/Dozentenmodul/src/thrift/AuthorizationError.java @@ -0,0 +1,48 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + + +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + +public enum AuthorizationError implements org.apache.thrift.TEnum { + GENERIC_ERROR(0), + NOT_AUTHENTICATED(1), + NO_PERMISSION(2); + + private final int value; + + private AuthorizationError(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static AuthorizationError findByValue(int value) { + switch (value) { + case 0: + return GENERIC_ERROR; + case 1: + return NOT_AUTHENTICATED; + case 2: + return NO_PERMISSION; + default: + return null; + } + } +} diff --git a/Dozentenmodul/src/thrift/AuthorizationException.java b/Dozentenmodul/src/thrift/AuthorizationException.java new file mode 100644 index 00000000..0d5320c2 --- /dev/null +++ b/Dozentenmodul/src/thrift/AuthorizationException.java @@ -0,0 +1,504 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AuthorizationException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); + + private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new AuthorizationExceptionStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AuthorizationExceptionTupleSchemeFactory()); + } + + /** + * + * @see AuthorizationError + */ + public AuthorizationError number; // required + public String message; // 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 { + /** + * + * @see AuthorizationError + */ + NUMBER((short)1, "number"), + MESSAGE((short)2, "message"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // NUMBER + return NUMBER; + case 2: // MESSAGE + return MESSAGE; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.NUMBER, new org.apache.thrift.meta_data.FieldMetaData("number", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AuthorizationError.class))); + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthorizationException.class, metaDataMap); + } + + public AuthorizationException() { + } + + public AuthorizationException( + AuthorizationError number, + String message) + { + this(); + this.number = number; + this.message = message; + } + + /** + * Performs a deep copy on other. + */ + public AuthorizationException(AuthorizationException other) { + if (other.isSetNumber()) { + this.number = other.number; + } + if (other.isSetMessage()) { + this.message = other.message; + } + } + + public AuthorizationException deepCopy() { + return new AuthorizationException(this); + } + + @Override + public void clear() { + this.number = null; + this.message = null; + } + + /** + * + * @see AuthorizationError + */ + public AuthorizationError getNumber() { + return this.number; + } + + /** + * + * @see AuthorizationError + */ + public AuthorizationException setNumber(AuthorizationError number) { + this.number = number; + return this; + } + + public void unsetNumber() { + this.number = null; + } + + /** Returns true if field number is set (has been assigned a value) and false otherwise */ + public boolean isSetNumber() { + return this.number != null; + } + + public void setNumberIsSet(boolean value) { + if (!value) { + this.number = null; + } + } + + public String getMessage() { + return this.message; + } + + public AuthorizationException setMessage(String message) { + this.message = message; + return this; + } + + public void unsetMessage() { + this.message = null; + } + + /** Returns true if field message is set (has been assigned a value) and false otherwise */ + public boolean isSetMessage() { + return this.message != null; + } + + public void setMessageIsSet(boolean value) { + if (!value) { + this.message = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case NUMBER: + if (value == null) { + unsetNumber(); + } else { + setNumber((AuthorizationError)value); + } + break; + + case MESSAGE: + if (value == null) { + unsetMessage(); + } else { + setMessage((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case NUMBER: + return getNumber(); + + case MESSAGE: + return getMessage(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case NUMBER: + return isSetNumber(); + case MESSAGE: + return isSetMessage(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof AuthorizationException) + return this.equals((AuthorizationException)that); + return false; + } + + public boolean equals(AuthorizationException that) { + if (that == null) + return false; + + boolean this_present_number = true && this.isSetNumber(); + boolean that_present_number = true && that.isSetNumber(); + if (this_present_number || that_present_number) { + if (!(this_present_number && that_present_number)) + return false; + if (!this.number.equals(that.number)) + return false; + } + + boolean this_present_message = true && this.isSetMessage(); + boolean that_present_message = true && that.isSetMessage(); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(AuthorizationException other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNumber()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetMessage()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("AuthorizationException("); + boolean first = true; + + sb.append("number:"); + if (this.number == null) { + sb.append("null"); + } else { + sb.append(this.number); + } + first = false; + if (!first) sb.append(", "); + sb.append("message:"); + if (this.message == null) { + sb.append("null"); + } else { + sb.append(this.message); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class AuthorizationExceptionStandardSchemeFactory implements SchemeFactory { + public AuthorizationExceptionStandardScheme getScheme() { + return new AuthorizationExceptionStandardScheme(); + } + } + + private static class AuthorizationExceptionStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, AuthorizationException struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // NUMBER + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.number = AuthorizationError.findByValue(iprot.readI32()); + struct.setNumberIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // MESSAGE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.message = iprot.readString(); + struct.setMessageIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.number != null) { + oprot.writeFieldBegin(NUMBER_FIELD_DESC); + oprot.writeI32(struct.number.getValue()); + oprot.writeFieldEnd(); + } + if (struct.message != null) { + oprot.writeFieldBegin(MESSAGE_FIELD_DESC); + oprot.writeString(struct.message); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class AuthorizationExceptionTupleSchemeFactory implements SchemeFactory { + public AuthorizationExceptionTupleScheme getScheme() { + return new AuthorizationExceptionTupleScheme(); + } + } + + private static class AuthorizationExceptionTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetNumber()) { + optionals.set(0); + } + if (struct.isSetMessage()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetNumber()) { + oprot.writeI32(struct.number.getValue()); + } + if (struct.isSetMessage()) { + oprot.writeString(struct.message); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.number = AuthorizationError.findByValue(iprot.readI32()); + struct.setNumberIsSet(true); + } + if (incoming.get(1)) { + struct.message = iprot.readString(); + struct.setMessageIsSet(true); + } + } + } + +} + diff --git a/Dozentenmodul/src/thrift/ImageServer.java b/Dozentenmodul/src/thrift/ImageServer.java new file mode 100644 index 00000000..410f437b --- /dev/null +++ b/Dozentenmodul/src/thrift/ImageServer.java @@ -0,0 +1,2871 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ImageServer { + + public interface Iface { + + public boolean ping() throws org.apache.thrift.TException; + + public SessionData authenticate(String username, String password) throws AuthenticationException, org.apache.thrift.TException; + + public UserInfo getUserFromToken(String token) throws InvalidTokenException, org.apache.thrift.TException; + + } + + public interface AsyncIface { + + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + + } + + public static class Client extends org.apache.thrift.TServiceClient implements Iface { + public static class Factory implements org.apache.thrift.TServiceClientFactory { + public Factory() {} + public Client getClient(org.apache.thrift.protocol.TProtocol prot) { + return new Client(prot); + } + public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + return new Client(iprot, oprot); + } + } + + public Client(org.apache.thrift.protocol.TProtocol prot) + { + super(prot, prot); + } + + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + super(iprot, oprot); + } + + public boolean ping() throws org.apache.thrift.TException + { + send_ping(); + return recv_ping(); + } + + public void send_ping() throws org.apache.thrift.TException + { + ping_args args = new ping_args(); + sendBase("ping", args); + } + + public boolean recv_ping() throws org.apache.thrift.TException + { + ping_result result = new ping_result(); + receiveBase(result, "ping"); + if (result.isSetSuccess()) { + return result.success; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "ping failed: unknown result"); + } + + public SessionData authenticate(String username, String password) throws AuthenticationException, org.apache.thrift.TException + { + send_authenticate(username, password); + return recv_authenticate(); + } + + public void send_authenticate(String username, String password) throws org.apache.thrift.TException + { + authenticate_args args = new authenticate_args(); + args.setUsername(username); + args.setPassword(password); + sendBase("authenticate", args); + } + + public SessionData recv_authenticate() throws AuthenticationException, org.apache.thrift.TException + { + authenticate_result result = new authenticate_result(); + receiveBase(result, "authenticate"); + if (result.isSetSuccess()) { + return result.success; + } + if (result.failure != null) { + throw result.failure; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticate failed: unknown result"); + } + + public UserInfo getUserFromToken(String token) throws InvalidTokenException, org.apache.thrift.TException + { + send_getUserFromToken(token); + return recv_getUserFromToken(); + } + + public void send_getUserFromToken(String token) throws org.apache.thrift.TException + { + getUserFromToken_args args = new getUserFromToken_args(); + args.setToken(token); + sendBase("getUserFromToken", args); + } + + public UserInfo recv_getUserFromToken() throws InvalidTokenException, org.apache.thrift.TException + { + getUserFromToken_result result = new getUserFromToken_result(); + receiveBase(result, "getUserFromToken"); + if (result.isSetSuccess()) { + return result.success; + } + if (result.failure != null) { + throw result.failure; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserFromToken failed: unknown result"); + } + + } + public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { + public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { + private org.apache.thrift.async.TAsyncClientManager clientManager; + private org.apache.thrift.protocol.TProtocolFactory protocolFactory; + public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) { + this.clientManager = clientManager; + this.protocolFactory = protocolFactory; + } + public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { + return new AsyncClient(protocolFactory, clientManager, transport); + } + } + + public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { + super(protocolFactory, clientManager, transport); + } + + public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall { + public ping_call(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); + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("ping", org.apache.thrift.protocol.TMessageType.CALL, 0)); + ping_args args = new ping_args(); + args.write(prot); + prot.writeMessageEnd(); + } + + public boolean getResult() throws org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_ping(); + } + } + + public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + authenticate_call method_call = new authenticate_call(username, password, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall { + private String username; + private String password; + public authenticate_call(String username, String password, 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.username = username; + this.password = password; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("authenticate", org.apache.thrift.protocol.TMessageType.CALL, 0)); + authenticate_args args = new authenticate_args(); + args.setUsername(username); + args.setPassword(password); + args.write(prot); + prot.writeMessageEnd(); + } + + public SessionData getResult() throws AuthenticationException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_authenticate(); + } + } + + public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + checkReady(); + getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); + } + + public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall { + private String token; + public getUserFromToken_call(String token, 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.token = token; + } + + public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getUserFromToken", org.apache.thrift.protocol.TMessageType.CALL, 0)); + getUserFromToken_args args = new getUserFromToken_args(); + args.setToken(token); + args.write(prot); + prot.writeMessageEnd(); + } + + public UserInfo getResult() throws InvalidTokenException, org.apache.thrift.TException { + if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + throw new IllegalStateException("Method call not finished!"); + } + org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); + org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + return (new Client(prot)).recv_getUserFromToken(); + } + } + + } + + public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); + public Processor(I iface) { + super(iface, getProcessMap(new HashMap>())); + } + + protected Processor(I iface, Map> processMap) { + super(iface, getProcessMap(processMap)); + } + + private static Map> getProcessMap(Map> processMap) { + processMap.put("ping", new ping()); + processMap.put("authenticate", new authenticate()); + processMap.put("getUserFromToken", new getUserFromToken()); + return processMap; + } + + public static class ping extends org.apache.thrift.ProcessFunction { + public ping() { + super("ping"); + } + + public ping_args getEmptyArgsInstance() { + return new ping_args(); + } + + protected boolean isOneway() { + return false; + } + + public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException { + ping_result result = new ping_result(); + result.success = iface.ping(); + result.setSuccessIsSet(true); + return result; + } + } + + public static class authenticate extends org.apache.thrift.ProcessFunction { + public authenticate() { + super("authenticate"); + } + + public authenticate_args getEmptyArgsInstance() { + return new authenticate_args(); + } + + protected boolean isOneway() { + return false; + } + + public authenticate_result getResult(I iface, authenticate_args args) throws org.apache.thrift.TException { + authenticate_result result = new authenticate_result(); + try { + result.success = iface.authenticate(args.username, args.password); + } catch (AuthenticationException failure) { + result.failure = failure; + } + return result; + } + } + + public static class getUserFromToken extends org.apache.thrift.ProcessFunction { + public getUserFromToken() { + super("getUserFromToken"); + } + + public getUserFromToken_args getEmptyArgsInstance() { + return new getUserFromToken_args(); + } + + protected boolean isOneway() { + return false; + } + + public getUserFromToken_result getResult(I iface, getUserFromToken_args args) throws org.apache.thrift.TException { + getUserFromToken_result result = new getUserFromToken_result(); + try { + result.success = iface.getUserFromToken(args.token); + } catch (InvalidTokenException failure) { + result.failure = failure; + } + return result; + } + } + + } + + public static class AsyncProcessor extends org.apache.thrift.TBaseAsyncProcessor { + private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName()); + public AsyncProcessor(I iface) { + super(iface, getProcessMap(new HashMap>())); + } + + protected AsyncProcessor(I iface, Map> processMap) { + super(iface, getProcessMap(processMap)); + } + + private static Map> getProcessMap(Map> processMap) { + processMap.put("ping", new ping()); + processMap.put("authenticate", new authenticate()); + processMap.put("getUserFromToken", new getUserFromToken()); + return processMap; + } + + public static class ping extends org.apache.thrift.AsyncProcessFunction { + public ping() { + super("ping"); + } + + public ping_args getEmptyArgsInstance() { + return new ping_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(Boolean o) { + ping_result result = new ping_result(); + result.success = o; + result.setSuccessIsSet(true); + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + ping_result result = new ping_result(); + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.ping(resultHandler); + } + } + + public static class authenticate extends org.apache.thrift.AsyncProcessFunction { + public authenticate() { + super("authenticate"); + } + + public authenticate_args getEmptyArgsInstance() { + return new authenticate_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(SessionData o) { + authenticate_result result = new authenticate_result(); + result.success = o; + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + authenticate_result result = new authenticate_result(); + if (e instanceof AuthenticationException) { + result.failure = (AuthenticationException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.authenticate(args.username, args.password,resultHandler); + } + } + + public static class getUserFromToken extends org.apache.thrift.AsyncProcessFunction { + public getUserFromToken() { + super("getUserFromToken"); + } + + public getUserFromToken_args getEmptyArgsInstance() { + return new getUserFromToken_args(); + } + + public AsyncMethodCallback getResultHandler(final AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new AsyncMethodCallback() { + public void onComplete(UserInfo o) { + getUserFromToken_result result = new getUserFromToken_result(); + result.success = o; + try { + fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + return; + } catch (Exception e) { + LOGGER.error("Exception writing to internal frame buffer", e); + } + fb.close(); + } + public void onError(Exception e) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TBase msg; + getUserFromToken_result result = new getUserFromToken_result(); + if (e instanceof InvalidTokenException) { + result.failure = (InvalidTokenException) e; + result.setFailureIsSet(true); + msg = result; + } + else + { + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + return; + } catch (Exception ex) { + LOGGER.error("Exception writing to internal frame buffer", ex); + } + fb.close(); + } + }; + } + + protected boolean isOneway() { + return false; + } + + public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { + iface.getUserFromToken(args.token,resultHandler); + } + } + + } + + public static class ping_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args"); + + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new ping_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new ping_argsTupleSchemeFactory()); + } + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +; + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap); + } + + public ping_args() { + } + + /** + * Performs a deep copy on other. + */ + public ping_args(ping_args other) { + } + + public ping_args deepCopy() { + return new ping_args(this); + } + + @Override + public void clear() { + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof ping_args) + return this.equals((ping_args)that); + return false; + } + + public boolean equals(ping_args that) { + if (that == null) + return false; + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(ping_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("ping_args("); + boolean first = true; + + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class ping_argsStandardSchemeFactory implements SchemeFactory { + public ping_argsStandardScheme getScheme() { + return new ping_argsStandardScheme(); + } + } + + private static class ping_argsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, ping_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class ping_argsTupleSchemeFactory implements SchemeFactory { + public ping_argsTupleScheme getScheme() { + return new ping_argsTupleScheme(); + } + } + + private static class ping_argsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + } + } + + } + + public static class ping_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new ping_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new ping_resultTupleSchemeFactory()); + } + + public boolean success; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SUCCESS_ISSET_ID = 0; + private byte __isset_bitfield = 0; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap); + } + + public ping_result() { + } + + public ping_result( + boolean success) + { + this(); + this.success = success; + setSuccessIsSet(true); + } + + /** + * Performs a deep copy on other. + */ + public ping_result(ping_result other) { + __isset_bitfield = other.__isset_bitfield; + this.success = other.success; + } + + public ping_result deepCopy() { + return new ping_result(this); + } + + @Override + public void clear() { + setSuccessIsSet(false); + this.success = false; + } + + public boolean isSuccess() { + return this.success; + } + + public ping_result setSuccess(boolean success) { + this.success = success; + setSuccessIsSet(true); + return this; + } + + public void unsetSuccess() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID); + } + + public void setSuccessIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value); + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((Boolean)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return Boolean.valueOf(isSuccess()); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof ping_result) + return this.equals((ping_result)that); + return false; + } + + public boolean equals(ping_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(ping_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("ping_result("); + boolean first = true; + + sb.append("success:"); + sb.append(this.success); + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class ping_resultStandardSchemeFactory implements SchemeFactory { + public ping_resultStandardScheme getScheme() { + return new ping_resultStandardScheme(); + } + } + + private static class ping_resultStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, ping_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeBool(struct.success); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class ping_resultTupleSchemeFactory implements SchemeFactory { + public ping_resultTupleScheme getScheme() { + return new ping_resultTupleScheme(); + } + } + + private static class ping_resultTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetSuccess()) { + oprot.writeBool(struct.success); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.success = iprot.readBool(); + struct.setSuccessIsSet(true); + } + } + } + + } + + public static class authenticate_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_args"); + + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new authenticate_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new authenticate_argsTupleSchemeFactory()); + } + + public String username; // required + public String password; // 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 { + USERNAME((short)1, "username"), + PASSWORD((short)2, "password"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // USERNAME + return USERNAME; + case 2: // PASSWORD + return PASSWORD; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_args.class, metaDataMap); + } + + public authenticate_args() { + } + + public authenticate_args( + String username, + String password) + { + this(); + this.username = username; + this.password = password; + } + + /** + * Performs a deep copy on other. + */ + public authenticate_args(authenticate_args other) { + if (other.isSetUsername()) { + this.username = other.username; + } + if (other.isSetPassword()) { + this.password = other.password; + } + } + + public authenticate_args deepCopy() { + return new authenticate_args(this); + } + + @Override + public void clear() { + this.username = null; + this.password = null; + } + + public String getUsername() { + return this.username; + } + + public authenticate_args setUsername(String username) { + this.username = username; + return this; + } + + public void unsetUsername() { + this.username = null; + } + + /** Returns true if field username is set (has been assigned a value) and false otherwise */ + public boolean isSetUsername() { + return this.username != null; + } + + public void setUsernameIsSet(boolean value) { + if (!value) { + this.username = null; + } + } + + public String getPassword() { + return this.password; + } + + public authenticate_args setPassword(String password) { + this.password = password; + return this; + } + + public void unsetPassword() { + this.password = null; + } + + /** Returns true if field password is set (has been assigned a value) and false otherwise */ + public boolean isSetPassword() { + return this.password != null; + } + + public void setPasswordIsSet(boolean value) { + if (!value) { + this.password = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case USERNAME: + if (value == null) { + unsetUsername(); + } else { + setUsername((String)value); + } + break; + + case PASSWORD: + if (value == null) { + unsetPassword(); + } else { + setPassword((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case USERNAME: + return getUsername(); + + case PASSWORD: + return getPassword(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case USERNAME: + return isSetUsername(); + case PASSWORD: + return isSetPassword(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof authenticate_args) + return this.equals((authenticate_args)that); + return false; + } + + public boolean equals(authenticate_args that) { + if (that == null) + return false; + + boolean this_present_username = true && this.isSetUsername(); + boolean that_present_username = true && that.isSetUsername(); + if (this_present_username || that_present_username) { + if (!(this_present_username && that_present_username)) + return false; + if (!this.username.equals(that.username)) + return false; + } + + boolean this_present_password = true && this.isSetPassword(); + boolean that_present_password = true && that.isSetPassword(); + if (this_present_password || that_present_password) { + if (!(this_present_password && that_present_password)) + return false; + if (!this.password.equals(that.password)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(authenticate_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUsername()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPassword()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("authenticate_args("); + boolean first = true; + + sb.append("username:"); + if (this.username == null) { + sb.append("null"); + } else { + sb.append(this.username); + } + first = false; + if (!first) sb.append(", "); + sb.append("password:"); + if (this.password == null) { + sb.append("null"); + } else { + sb.append(this.password); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class authenticate_argsStandardSchemeFactory implements SchemeFactory { + public authenticate_argsStandardScheme getScheme() { + return new authenticate_argsStandardScheme(); + } + } + + private static class authenticate_argsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // USERNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.username = iprot.readString(); + struct.setUsernameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // PASSWORD + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.password = iprot.readString(); + struct.setPasswordIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, authenticate_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.username != null) { + oprot.writeFieldBegin(USERNAME_FIELD_DESC); + oprot.writeString(struct.username); + oprot.writeFieldEnd(); + } + if (struct.password != null) { + oprot.writeFieldBegin(PASSWORD_FIELD_DESC); + oprot.writeString(struct.password); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class authenticate_argsTupleSchemeFactory implements SchemeFactory { + public authenticate_argsTupleScheme getScheme() { + return new authenticate_argsTupleScheme(); + } + } + + private static class authenticate_argsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetUsername()) { + optionals.set(0); + } + if (struct.isSetPassword()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetUsername()) { + oprot.writeString(struct.username); + } + if (struct.isSetPassword()) { + oprot.writeString(struct.password); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.username = iprot.readString(); + struct.setUsernameIsSet(true); + } + if (incoming.get(1)) { + struct.password = iprot.readString(); + struct.setPasswordIsSet(true); + } + } + } + + } + + public static class authenticate_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new authenticate_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new authenticate_resultTupleSchemeFactory()); + } + + public SessionData success; // required + public AuthenticationException failure; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), + FAILURE((short)1, "failure"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + case 1: // FAILURE + return FAILURE; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionData.class))); + tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_result.class, metaDataMap); + } + + public authenticate_result() { + } + + public authenticate_result( + SessionData success, + AuthenticationException failure) + { + this(); + this.success = success; + this.failure = failure; + } + + /** + * Performs a deep copy on other. + */ + public authenticate_result(authenticate_result other) { + if (other.isSetSuccess()) { + this.success = new SessionData(other.success); + } + if (other.isSetFailure()) { + this.failure = new AuthenticationException(other.failure); + } + } + + public authenticate_result deepCopy() { + return new authenticate_result(this); + } + + @Override + public void clear() { + this.success = null; + this.failure = null; + } + + public SessionData getSuccess() { + return this.success; + } + + public authenticate_result setSuccess(SessionData success) { + this.success = success; + return this; + } + + public void unsetSuccess() { + this.success = null; + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return this.success != null; + } + + public void setSuccessIsSet(boolean value) { + if (!value) { + this.success = null; + } + } + + public AuthenticationException getFailure() { + return this.failure; + } + + public authenticate_result setFailure(AuthenticationException failure) { + this.failure = failure; + return this; + } + + public void unsetFailure() { + this.failure = null; + } + + /** Returns true if field failure is set (has been assigned a value) and false otherwise */ + public boolean isSetFailure() { + return this.failure != null; + } + + public void setFailureIsSet(boolean value) { + if (!value) { + this.failure = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((SessionData)value); + } + break; + + case FAILURE: + if (value == null) { + unsetFailure(); + } else { + setFailure((AuthenticationException)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return getSuccess(); + + case FAILURE: + return getFailure(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + case FAILURE: + return isSetFailure(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof authenticate_result) + return this.equals((authenticate_result)that); + return false; + } + + public boolean equals(authenticate_result that) { + if (that == null) + return false; + + boolean this_present_success = true && this.isSetSuccess(); + boolean that_present_success = true && that.isSetSuccess(); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_failure = true && this.isSetFailure(); + boolean that_present_failure = true && that.isSetFailure(); + if (this_present_failure || that_present_failure) { + if (!(this_present_failure && that_present_failure)) + return false; + if (!this.failure.equals(that.failure)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(authenticate_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFailure()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("authenticate_result("); + boolean first = true; + + sb.append("success:"); + if (this.success == null) { + sb.append("null"); + } else { + sb.append(this.success); + } + first = false; + if (!first) sb.append(", "); + sb.append("failure:"); + if (this.failure == null) { + sb.append("null"); + } else { + sb.append(this.failure); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class authenticate_resultStandardSchemeFactory implements SchemeFactory { + public authenticate_resultStandardScheme getScheme() { + return new authenticate_resultStandardScheme(); + } + } + + private static class authenticate_resultStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.success = new SessionData(); + struct.success.read(iprot); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 1: // FAILURE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.failure = new AuthenticationException(); + struct.failure.read(iprot); + struct.setFailureIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, authenticate_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + struct.success.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.failure != null) { + oprot.writeFieldBegin(FAILURE_FIELD_DESC); + struct.failure.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class authenticate_resultTupleSchemeFactory implements SchemeFactory { + public authenticate_resultTupleScheme getScheme() { + return new authenticate_resultTupleScheme(); + } + } + + private static class authenticate_resultTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + if (struct.isSetFailure()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { + struct.success.write(oprot); + } + if (struct.isSetFailure()) { + struct.failure.write(oprot); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.success = new SessionData(); + struct.success.read(iprot); + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { + struct.failure = new AuthenticationException(); + struct.failure.read(iprot); + struct.setFailureIsSet(true); + } + } + } + + } + + public static class getUserFromToken_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_args"); + + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new getUserFromToken_argsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new getUserFromToken_argsTupleSchemeFactory()); + } + + public String token; // 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 { + TOKEN((short)1, "token"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // TOKEN + return TOKEN; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_args.class, metaDataMap); + } + + public getUserFromToken_args() { + } + + public getUserFromToken_args( + String token) + { + this(); + this.token = token; + } + + /** + * Performs a deep copy on other. + */ + public getUserFromToken_args(getUserFromToken_args other) { + if (other.isSetToken()) { + this.token = other.token; + } + } + + public getUserFromToken_args deepCopy() { + return new getUserFromToken_args(this); + } + + @Override + public void clear() { + this.token = null; + } + + public String getToken() { + return this.token; + } + + public getUserFromToken_args setToken(String token) { + this.token = token; + return this; + } + + public void unsetToken() { + this.token = null; + } + + /** Returns true if field token is set (has been assigned a value) and false otherwise */ + public boolean isSetToken() { + return this.token != null; + } + + public void setTokenIsSet(boolean value) { + if (!value) { + this.token = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case TOKEN: + if (value == null) { + unsetToken(); + } else { + setToken((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case TOKEN: + return getToken(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case TOKEN: + return isSetToken(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getUserFromToken_args) + return this.equals((getUserFromToken_args)that); + return false; + } + + public boolean equals(getUserFromToken_args that) { + if (that == null) + return false; + + boolean this_present_token = true && this.isSetToken(); + boolean that_present_token = true && that.isSetToken(); + if (this_present_token || that_present_token) { + if (!(this_present_token && that_present_token)) + return false; + if (!this.token.equals(that.token)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(getUserFromToken_args other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("getUserFromToken_args("); + boolean first = true; + + sb.append("token:"); + if (this.token == null) { + sb.append("null"); + } else { + sb.append(this.token); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class getUserFromToken_argsStandardSchemeFactory implements SchemeFactory { + public getUserFromToken_argsStandardScheme getScheme() { + return new getUserFromToken_argsStandardScheme(); + } + } + + private static class getUserFromToken_argsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_args struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, getUserFromToken_args struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.token != null) { + oprot.writeFieldBegin(TOKEN_FIELD_DESC); + oprot.writeString(struct.token); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class getUserFromToken_argsTupleSchemeFactory implements SchemeFactory { + public getUserFromToken_argsTupleScheme getScheme() { + return new getUserFromToken_argsTupleScheme(); + } + } + + private static class getUserFromToken_argsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetToken()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetToken()) { + oprot.writeString(struct.token); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.token = iprot.readString(); + struct.setTokenIsSet(true); + } + } + } + + } + + public static class getUserFromToken_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_result"); + + private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); + private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new getUserFromToken_resultStandardSchemeFactory()); + schemes.put(TupleScheme.class, new getUserFromToken_resultTupleSchemeFactory()); + } + + public UserInfo success; // required + public InvalidTokenException failure; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SUCCESS((short)0, "success"), + FAILURE((short)1, "failure"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 0: // SUCCESS + return SUCCESS; + case 1: // FAILURE + return FAILURE; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class))); + tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_result.class, metaDataMap); + } + + public getUserFromToken_result() { + } + + public getUserFromToken_result( + UserInfo success, + InvalidTokenException failure) + { + this(); + this.success = success; + this.failure = failure; + } + + /** + * Performs a deep copy on other. + */ + public getUserFromToken_result(getUserFromToken_result other) { + if (other.isSetSuccess()) { + this.success = new UserInfo(other.success); + } + if (other.isSetFailure()) { + this.failure = new InvalidTokenException(other.failure); + } + } + + public getUserFromToken_result deepCopy() { + return new getUserFromToken_result(this); + } + + @Override + public void clear() { + this.success = null; + this.failure = null; + } + + public UserInfo getSuccess() { + return this.success; + } + + public getUserFromToken_result setSuccess(UserInfo success) { + this.success = success; + return this; + } + + public void unsetSuccess() { + this.success = null; + } + + /** Returns true if field success is set (has been assigned a value) and false otherwise */ + public boolean isSetSuccess() { + return this.success != null; + } + + public void setSuccessIsSet(boolean value) { + if (!value) { + this.success = null; + } + } + + public InvalidTokenException getFailure() { + return this.failure; + } + + public getUserFromToken_result setFailure(InvalidTokenException failure) { + this.failure = failure; + return this; + } + + public void unsetFailure() { + this.failure = null; + } + + /** Returns true if field failure is set (has been assigned a value) and false otherwise */ + public boolean isSetFailure() { + return this.failure != null; + } + + public void setFailureIsSet(boolean value) { + if (!value) { + this.failure = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((UserInfo)value); + } + break; + + case FAILURE: + if (value == null) { + unsetFailure(); + } else { + setFailure((InvalidTokenException)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SUCCESS: + return getSuccess(); + + case FAILURE: + return getFailure(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SUCCESS: + return isSetSuccess(); + case FAILURE: + return isSetFailure(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getUserFromToken_result) + return this.equals((getUserFromToken_result)that); + return false; + } + + public boolean equals(getUserFromToken_result that) { + if (that == null) + return false; + + boolean this_present_success = true && this.isSetSuccess(); + boolean that_present_success = true && that.isSetSuccess(); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_failure = true && this.isSetFailure(); + boolean that_present_failure = true && that.isSetFailure(); + if (this_present_failure || that_present_failure) { + if (!(this_present_failure && that_present_failure)) + return false; + if (!this.failure.equals(that.failure)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(getUserFromToken_result other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFailure()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("getUserFromToken_result("); + boolean first = true; + + sb.append("success:"); + if (this.success == null) { + sb.append("null"); + } else { + sb.append(this.success); + } + first = false; + if (!first) sb.append(", "); + sb.append("failure:"); + if (this.failure == null) { + sb.append("null"); + } else { + sb.append(this.failure); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + if (success != null) { + success.validate(); + } + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class getUserFromToken_resultStandardSchemeFactory implements SchemeFactory { + public getUserFromToken_resultStandardScheme getScheme() { + return new getUserFromToken_resultStandardScheme(); + } + } + + private static class getUserFromToken_resultStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_result struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.success = new UserInfo(); + struct.success.read(iprot); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 1: // FAILURE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.failure = new InvalidTokenException(); + struct.failure.read(iprot); + struct.setFailureIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, getUserFromToken_result struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.success != null) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + struct.success.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.failure != null) { + oprot.writeFieldBegin(FAILURE_FIELD_DESC); + struct.failure.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class getUserFromToken_resultTupleSchemeFactory implements SchemeFactory { + public getUserFromToken_resultTupleScheme getScheme() { + return new getUserFromToken_resultTupleScheme(); + } + } + + private static class getUserFromToken_resultTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSuccess()) { + optionals.set(0); + } + if (struct.isSetFailure()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetSuccess()) { + struct.success.write(oprot); + } + if (struct.isSetFailure()) { + struct.failure.write(oprot); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.success = new UserInfo(); + struct.success.read(iprot); + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { + struct.failure = new InvalidTokenException(); + struct.failure.read(iprot); + struct.setFailureIsSet(true); + } + } + } + + } + +} diff --git a/Dozentenmodul/src/thrift/InvalidTokenException.java b/Dozentenmodul/src/thrift/InvalidTokenException.java new file mode 100644 index 00000000..914199b5 --- /dev/null +++ b/Dozentenmodul/src/thrift/InvalidTokenException.java @@ -0,0 +1,280 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class InvalidTokenException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException"); + + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new InvalidTokenExceptionStandardSchemeFactory()); + schemes.put(TupleScheme.class, new InvalidTokenExceptionTupleSchemeFactory()); + } + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { +; + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InvalidTokenException.class, metaDataMap); + } + + public InvalidTokenException() { + } + + /** + * Performs a deep copy on other. + */ + public InvalidTokenException(InvalidTokenException other) { + } + + public InvalidTokenException deepCopy() { + return new InvalidTokenException(this); + } + + @Override + public void clear() { + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof InvalidTokenException) + return this.equals((InvalidTokenException)that); + return false; + } + + public boolean equals(InvalidTokenException that) { + if (that == null) + return false; + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(InvalidTokenException other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("InvalidTokenException("); + boolean first = true; + + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class InvalidTokenExceptionStandardSchemeFactory implements SchemeFactory { + public InvalidTokenExceptionStandardScheme getScheme() { + return new InvalidTokenExceptionStandardScheme(); + } + } + + private static class InvalidTokenExceptionStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidTokenException struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidTokenException struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class InvalidTokenExceptionTupleSchemeFactory implements SchemeFactory { + public InvalidTokenExceptionTupleScheme getScheme() { + return new InvalidTokenExceptionTupleScheme(); + } + } + + private static class InvalidTokenExceptionTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, InvalidTokenException struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, InvalidTokenException struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + } + } + +} + diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java new file mode 100644 index 00000000..ecbc689c --- /dev/null +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -0,0 +1,38 @@ +package thrift; + +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; +import org.apache.thrift.transport.TTransportException; + +import thrift.ImageServer.Client; + + + +public class MasterThriftConnection { + final TTransport transport = new TSocket("132.230.4.16", 9090); + public Client getMasterThriftConnection() + { + + try { + transport.open(); + } catch (TTransportException e) { + System.out.println("Keine Verbindung möglich!"); + return null; + } + + final TProtocol protocol = new TBinaryProtocol(transport); + final Client client = new Client(protocol); + + + System.out.println("Der Server läuft!"); + + return client; + } + + public void closeMasterThriftConnection() + { + transport.close(); + } +} diff --git a/Dozentenmodul/src/thrift/SessionData.java b/Dozentenmodul/src/thrift/SessionData.java new file mode 100644 index 00000000..98ef43b4 --- /dev/null +++ b/Dozentenmodul/src/thrift/SessionData.java @@ -0,0 +1,488 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SessionData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData"); + + private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField AUTH_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authToken", org.apache.thrift.protocol.TType.STRING, (short)2); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new SessionDataStandardSchemeFactory()); + schemes.put(TupleScheme.class, new SessionDataTupleSchemeFactory()); + } + + public String sessionId; // required + public String authToken; // 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 { + SESSION_ID((short)1, "sessionId"), + AUTH_TOKEN((short)2, "authToken"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // SESSION_ID + return SESSION_ID; + case 2: // AUTH_TOKEN + return AUTH_TOKEN; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "ID"))); + tmpMap.put(_Fields.AUTH_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authToken", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Token"))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SessionData.class, metaDataMap); + } + + public SessionData() { + } + + public SessionData( + String sessionId, + String authToken) + { + this(); + this.sessionId = sessionId; + this.authToken = authToken; + } + + /** + * Performs a deep copy on other. + */ + public SessionData(SessionData other) { + if (other.isSetSessionId()) { + this.sessionId = other.sessionId; + } + if (other.isSetAuthToken()) { + this.authToken = other.authToken; + } + } + + public SessionData deepCopy() { + return new SessionData(this); + } + + @Override + public void clear() { + this.sessionId = null; + this.authToken = null; + } + + public String getSessionId() { + return this.sessionId; + } + + public SessionData setSessionId(String sessionId) { + this.sessionId = sessionId; + return this; + } + + public void unsetSessionId() { + this.sessionId = null; + } + + /** Returns true if field sessionId is set (has been assigned a value) and false otherwise */ + public boolean isSetSessionId() { + return this.sessionId != null; + } + + public void setSessionIdIsSet(boolean value) { + if (!value) { + this.sessionId = null; + } + } + + public String getAuthToken() { + return this.authToken; + } + + public SessionData setAuthToken(String authToken) { + this.authToken = authToken; + return this; + } + + public void unsetAuthToken() { + this.authToken = null; + } + + /** Returns true if field authToken is set (has been assigned a value) and false otherwise */ + public boolean isSetAuthToken() { + return this.authToken != null; + } + + public void setAuthTokenIsSet(boolean value) { + if (!value) { + this.authToken = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SESSION_ID: + if (value == null) { + unsetSessionId(); + } else { + setSessionId((String)value); + } + break; + + case AUTH_TOKEN: + if (value == null) { + unsetAuthToken(); + } else { + setAuthToken((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SESSION_ID: + return getSessionId(); + + case AUTH_TOKEN: + return getAuthToken(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SESSION_ID: + return isSetSessionId(); + case AUTH_TOKEN: + return isSetAuthToken(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof SessionData) + return this.equals((SessionData)that); + return false; + } + + public boolean equals(SessionData that) { + if (that == null) + return false; + + boolean this_present_sessionId = true && this.isSetSessionId(); + boolean that_present_sessionId = true && that.isSetSessionId(); + if (this_present_sessionId || that_present_sessionId) { + if (!(this_present_sessionId && that_present_sessionId)) + return false; + if (!this.sessionId.equals(that.sessionId)) + return false; + } + + boolean this_present_authToken = true && this.isSetAuthToken(); + boolean that_present_authToken = true && that.isSetAuthToken(); + if (this_present_authToken || that_present_authToken) { + if (!(this_present_authToken && that_present_authToken)) + return false; + if (!this.authToken.equals(that.authToken)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(SessionData other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSessionId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetAuthToken()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, other.authToken); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("SessionData("); + boolean first = true; + + sb.append("sessionId:"); + if (this.sessionId == null) { + sb.append("null"); + } else { + sb.append(this.sessionId); + } + first = false; + if (!first) sb.append(", "); + sb.append("authToken:"); + if (this.authToken == null) { + sb.append("null"); + } else { + sb.append(this.authToken); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class SessionDataStandardSchemeFactory implements SchemeFactory { + public SessionDataStandardScheme getScheme() { + return new SessionDataStandardScheme(); + } + } + + private static class SessionDataStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, SessionData struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // SESSION_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.sessionId = iprot.readString(); + struct.setSessionIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // AUTH_TOKEN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.authToken = iprot.readString(); + struct.setAuthTokenIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, SessionData struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.sessionId != null) { + oprot.writeFieldBegin(SESSION_ID_FIELD_DESC); + oprot.writeString(struct.sessionId); + oprot.writeFieldEnd(); + } + if (struct.authToken != null) { + oprot.writeFieldBegin(AUTH_TOKEN_FIELD_DESC); + oprot.writeString(struct.authToken); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class SessionDataTupleSchemeFactory implements SchemeFactory { + public SessionDataTupleScheme getScheme() { + return new SessionDataTupleScheme(); + } + } + + private static class SessionDataTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, SessionData struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetSessionId()) { + optionals.set(0); + } + if (struct.isSetAuthToken()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetSessionId()) { + oprot.writeString(struct.sessionId); + } + if (struct.isSetAuthToken()) { + oprot.writeString(struct.authToken); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, SessionData struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(2); + if (incoming.get(0)) { + struct.sessionId = iprot.readString(); + struct.setSessionIdIsSet(true); + } + if (incoming.get(1)) { + struct.authToken = iprot.readString(); + struct.setAuthTokenIsSet(true); + } + } + } + +} + diff --git a/Dozentenmodul/src/thrift/UserInfo.java b/Dozentenmodul/src/thrift/UserInfo.java new file mode 100644 index 00000000..56678646 --- /dev/null +++ b/Dozentenmodul/src/thrift/UserInfo.java @@ -0,0 +1,688 @@ +/** + * Autogenerated by Thrift Compiler (0.9.1) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UserInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo"); + + private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField E_MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("eMail", org.apache.thrift.protocol.TType.STRING, (short)4); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new UserInfoStandardSchemeFactory()); + schemes.put(TupleScheme.class, new UserInfoTupleSchemeFactory()); + } + + public String userId; // required + public String firstName; // required + public String lastName; // required + public String eMail; // 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 { + USER_ID((short)1, "userId"), + FIRST_NAME((short)2, "firstName"), + LAST_NAME((short)3, "lastName"), + E_MAIL((short)4, "eMail"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // USER_ID + return USER_ID; + case 2: // FIRST_NAME + return FIRST_NAME; + case 3: // LAST_NAME + return LAST_NAME; + case 4: // E_MAIL + return E_MAIL; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userId", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.E_MAIL, new org.apache.thrift.meta_data.FieldMetaData("eMail", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserInfo.class, metaDataMap); + } + + public UserInfo() { + } + + public UserInfo( + String userId, + String firstName, + String lastName, + String eMail) + { + this(); + this.userId = userId; + this.firstName = firstName; + this.lastName = lastName; + this.eMail = eMail; + } + + /** + * Performs a deep copy on other. + */ + public UserInfo(UserInfo other) { + if (other.isSetUserId()) { + this.userId = other.userId; + } + if (other.isSetFirstName()) { + this.firstName = other.firstName; + } + if (other.isSetLastName()) { + this.lastName = other.lastName; + } + if (other.isSetEMail()) { + this.eMail = other.eMail; + } + } + + public UserInfo deepCopy() { + return new UserInfo(this); + } + + @Override + public void clear() { + this.userId = null; + this.firstName = null; + this.lastName = null; + this.eMail = null; + } + + public String getUserId() { + return this.userId; + } + + public UserInfo setUserId(String userId) { + this.userId = userId; + return this; + } + + public void unsetUserId() { + this.userId = null; + } + + /** Returns true if field userId is set (has been assigned a value) and false otherwise */ + public boolean isSetUserId() { + return this.userId != null; + } + + public void setUserIdIsSet(boolean value) { + if (!value) { + this.userId = null; + } + } + + public String getFirstName() { + return this.firstName; + } + + public UserInfo setFirstName(String firstName) { + this.firstName = firstName; + return this; + } + + public void unsetFirstName() { + this.firstName = null; + } + + /** Returns true if field firstName is set (has been assigned a value) and false otherwise */ + public boolean isSetFirstName() { + return this.firstName != null; + } + + public void setFirstNameIsSet(boolean value) { + if (!value) { + this.firstName = null; + } + } + + public String getLastName() { + return this.lastName; + } + + public UserInfo setLastName(String lastName) { + this.lastName = lastName; + return this; + } + + public void unsetLastName() { + this.lastName = null; + } + + /** Returns true if field lastName is set (has been assigned a value) and false otherwise */ + public boolean isSetLastName() { + return this.lastName != null; + } + + public void setLastNameIsSet(boolean value) { + if (!value) { + this.lastName = null; + } + } + + public String getEMail() { + return this.eMail; + } + + public UserInfo setEMail(String eMail) { + this.eMail = eMail; + return this; + } + + public void unsetEMail() { + this.eMail = null; + } + + /** Returns true if field eMail is set (has been assigned a value) and false otherwise */ + public boolean isSetEMail() { + return this.eMail != null; + } + + public void setEMailIsSet(boolean value) { + if (!value) { + this.eMail = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case USER_ID: + if (value == null) { + unsetUserId(); + } else { + setUserId((String)value); + } + break; + + case FIRST_NAME: + if (value == null) { + unsetFirstName(); + } else { + setFirstName((String)value); + } + break; + + case LAST_NAME: + if (value == null) { + unsetLastName(); + } else { + setLastName((String)value); + } + break; + + case E_MAIL: + if (value == null) { + unsetEMail(); + } else { + setEMail((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case USER_ID: + return getUserId(); + + case FIRST_NAME: + return getFirstName(); + + case LAST_NAME: + return getLastName(); + + case E_MAIL: + return getEMail(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case USER_ID: + return isSetUserId(); + case FIRST_NAME: + return isSetFirstName(); + case LAST_NAME: + return isSetLastName(); + case E_MAIL: + return isSetEMail(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof UserInfo) + return this.equals((UserInfo)that); + return false; + } + + public boolean equals(UserInfo that) { + if (that == null) + return false; + + boolean this_present_userId = true && this.isSetUserId(); + boolean that_present_userId = true && that.isSetUserId(); + if (this_present_userId || that_present_userId) { + if (!(this_present_userId && that_present_userId)) + return false; + if (!this.userId.equals(that.userId)) + return false; + } + + boolean this_present_firstName = true && this.isSetFirstName(); + boolean that_present_firstName = true && that.isSetFirstName(); + if (this_present_firstName || that_present_firstName) { + if (!(this_present_firstName && that_present_firstName)) + return false; + if (!this.firstName.equals(that.firstName)) + return false; + } + + boolean this_present_lastName = true && this.isSetLastName(); + boolean that_present_lastName = true && that.isSetLastName(); + if (this_present_lastName || that_present_lastName) { + if (!(this_present_lastName && that_present_lastName)) + return false; + if (!this.lastName.equals(that.lastName)) + return false; + } + + boolean this_present_eMail = true && this.isSetEMail(); + boolean that_present_eMail = true && that.isSetEMail(); + if (this_present_eMail || that_present_eMail) { + if (!(this_present_eMail && that_present_eMail)) + return false; + if (!this.eMail.equals(that.eMail)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public int compareTo(UserInfo other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUserId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFirstName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLastName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetEMail()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, other.eMail); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("UserInfo("); + boolean first = true; + + sb.append("userId:"); + if (this.userId == null) { + sb.append("null"); + } else { + sb.append(this.userId); + } + first = false; + if (!first) sb.append(", "); + sb.append("firstName:"); + if (this.firstName == null) { + sb.append("null"); + } else { + sb.append(this.firstName); + } + first = false; + if (!first) sb.append(", "); + sb.append("lastName:"); + if (this.lastName == null) { + sb.append("null"); + } else { + sb.append(this.lastName); + } + first = false; + if (!first) sb.append(", "); + sb.append("eMail:"); + if (this.eMail == null) { + sb.append("null"); + } else { + sb.append(this.eMail); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class UserInfoStandardSchemeFactory implements SchemeFactory { + public UserInfoStandardScheme getScheme() { + return new UserInfoStandardScheme(); + } + } + + private static class UserInfoStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, UserInfo struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // USER_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.userId = iprot.readString(); + struct.setUserIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // FIRST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // LAST_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // E_MAIL + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.eMail = iprot.readString(); + struct.setEMailIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, UserInfo struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.userId != null) { + oprot.writeFieldBegin(USER_ID_FIELD_DESC); + oprot.writeString(struct.userId); + oprot.writeFieldEnd(); + } + if (struct.firstName != null) { + oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC); + oprot.writeString(struct.firstName); + oprot.writeFieldEnd(); + } + if (struct.lastName != null) { + oprot.writeFieldBegin(LAST_NAME_FIELD_DESC); + oprot.writeString(struct.lastName); + oprot.writeFieldEnd(); + } + if (struct.eMail != null) { + oprot.writeFieldBegin(E_MAIL_FIELD_DESC); + oprot.writeString(struct.eMail); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class UserInfoTupleSchemeFactory implements SchemeFactory { + public UserInfoTupleScheme getScheme() { + return new UserInfoTupleScheme(); + } + } + + private static class UserInfoTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, UserInfo struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + BitSet optionals = new BitSet(); + if (struct.isSetUserId()) { + optionals.set(0); + } + if (struct.isSetFirstName()) { + optionals.set(1); + } + if (struct.isSetLastName()) { + optionals.set(2); + } + if (struct.isSetEMail()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetUserId()) { + oprot.writeString(struct.userId); + } + if (struct.isSetFirstName()) { + oprot.writeString(struct.firstName); + } + if (struct.isSetLastName()) { + oprot.writeString(struct.lastName); + } + if (struct.isSetEMail()) { + oprot.writeString(struct.eMail); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, UserInfo struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + BitSet incoming = iprot.readBitSet(4); + if (incoming.get(0)) { + struct.userId = iprot.readString(); + struct.setUserIdIsSet(true); + } + if (incoming.get(1)) { + struct.firstName = iprot.readString(); + struct.setFirstNameIsSet(true); + } + if (incoming.get(2)) { + struct.lastName = iprot.readString(); + struct.setLastNameIsSet(true); + } + if (incoming.get(3)) { + struct.eMail = iprot.readString(); + struct.setEMailIsSet(true); + } + } + } + +} + -- cgit v1.2.3-55-g7522 From ddd6cc7400e00586d52840deb0ec8df98f69de4a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Mar 2014 12:49:02 +0100 Subject: -XML Creator eingebaut -Dateiname angepasst -> Uploader funktioniert nun wieder --- Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 8826 -> 8826 bytes .../bin/GUI/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7645 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 1382 -> 1382 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 1775 -> 1775 bytes .../GUI/EingabeVeranstaltungAllgemein_GUI.class | Bin 7415 -> 7415 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI.class | Bin 9135 -> 9098 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes Dozentenmodul/bin/GUI/FTPUploader_GUI.class | Bin 10530 -> 11083 bytes Dozentenmodul/bin/GUI/LinkImage_GUI$7.class | Bin 2402 -> 2402 bytes Dozentenmodul/bin/GUI/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/GUI/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/GUI/Login_GUI$3.class | Bin 2392 -> 4427 bytes Dozentenmodul/bin/GUI/Login_GUI.class | Bin 3731 -> 3947 bytes Dozentenmodul/bin/Models/person.class | Bin 1882 -> 2032 bytes Dozentenmodul/bin/auth/Authentification.class | Bin 283 -> 449 bytes Dozentenmodul/bin/ftp/FTPUtility.class | Bin 5153 -> 5211 bytes Dozentenmodul/bin/ftp/UploadTask.class | Bin 3378 -> 3378 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 8826 -> 8826 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI.class | Bin 7075 -> 7075 bytes .../bin/gui/EingabeImageAllgemein_GUI.class | Bin 7645 -> 7645 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$3.class | Bin 1382 -> 1382 bytes .../gui/EingabeVeranstaltungAllgemein_GUI$4.class | Bin 1775 -> 1775 bytes .../gui/EingabeVeranstaltungAllgemein_GUI.class | Bin 7415 -> 7415 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI.class | Bin 9135 -> 9098 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$1.class | Bin 738 -> 738 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$2.class | Bin 1193 -> 1193 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$3.class | Bin 1312 -> 1312 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$4.class | Bin 735 -> 735 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$5.class | Bin 1449 -> 1449 bytes Dozentenmodul/bin/gui/FTPUploader_GUI$6.class | Bin 1574 -> 1574 bytes Dozentenmodul/bin/gui/FTPUploader_GUI.class | Bin 10530 -> 11083 bytes Dozentenmodul/bin/gui/LinkImage_GUI$7.class | Bin 2402 -> 2402 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 4049 -> 4427 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 3947 -> 3947 bytes Dozentenmodul/bin/models/person.class | Bin 1882 -> 2032 bytes Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java | 8 +- .../src/GUI/EingabeImageAllgemein_GUI.java | 8 +- .../src/GUI/EingabeVeranstaltungAllgemein_GUI.java | 24 +-- Dozentenmodul/src/GUI/FTPDownloader_GUI.java | 2 +- Dozentenmodul/src/GUI/FTPUploader_GUI.java | 13 +- Dozentenmodul/src/GUI/LinkImage_GUI.java | 2 +- Dozentenmodul/src/GUI/Login_GUI.java | 45 ++++- Dozentenmodul/src/Models/person.java | 11 +- Dozentenmodul/src/auth/Authentification.java | 7 + Dozentenmodul/src/ftp/FTPUtility.java | 10 +- Dozentenmodul/src/ftp/UploadTask.java | 3 +- Dozentenmodul/src/gui/EditImageAllgemein_GUI.java | 8 +- .../src/gui/EditVeranstaltungAllgemein_GUI.java | 8 +- .../src/gui/EingabeImageAllgemein_GUI.java | 8 +- .../src/gui/EingabeVeranstaltungAllgemein_GUI.java | 24 +-- Dozentenmodul/src/gui/FTPDownloader_GUI.java | 2 +- Dozentenmodul/src/gui/FTPUploader_GUI.java | 13 +- Dozentenmodul/src/gui/LinkImage_GUI.java | 2 +- Dozentenmodul/src/gui/Login_GUI.java | 18 +- Dozentenmodul/src/models/person.java | 11 +- .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 2993 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 2945 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 3332 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 3246 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3157 -> 3157 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 3863 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4410 -> 4410 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4135 -> 4241 bytes .../bin/server/Server$AsyncClient.class | Bin 7862 -> 7922 bytes .../bin/server/Server$AsyncIface.class | Bin 1407 -> 1425 bytes .../Server$AsyncProcessor$DeleteFtpUser$1.class | Bin 2969 -> 2969 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS$1.class | Bin 2997 -> 2997 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../Server$AsyncProcessor$getFtpUser$1.class | Bin 2851 -> 2851 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData$1.class | Bin 3081 -> 3081 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList$1.class | Bin 3021 -> 3021 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData$1.class | Bin 3099 -> 3099 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getPathOfImage$1.class | Bin 2907 -> 2907 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3128 -> 3128 bytes .../Server$AsyncProcessor$getPersonData$1.class | Bin 3090 -> 3090 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy$1.class | Bin 2984 -> 2984 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData$1.class | Bin 3002 -> 3002 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata$1.class | Bin 3011 -> 3011 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../Server$AsyncProcessor$writeVLdata$1.class | Bin 2966 -> 2966 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3446 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3280 -> 3280 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 13975 -> 14082 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 1577 -> 1595 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 2036 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2014 -> 2014 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 2279 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2563 -> 2563 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2346 -> 2390 bytes .../bin/server/Server$Processor.class | Bin 3113 -> 3113 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3462 -> 3462 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 10610 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3007 -> 3007 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2640 -> 2640 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2124 -> 2124 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 9481 -> 9481 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 3587 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 3944 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3289 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 18468 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4053 -> 4053 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 4862 -> 4862 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4056 -> 4056 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 24604 -> 24604 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3821 -> 3914 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4451 -> 4637 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 3724 -> 3886 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 22061 -> 23310 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 8905 -> 9540 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 11577 -> 11593 bytes Dozentenmodulserver/bin/util/XMLCreator.class | Bin 0 -> 6252 bytes Dozentenmodulserver/src/server/Server.java | 132 +++++++++++-- Dozentenmodulserver/src/server/ServerHandler.java | 25 ++- Dozentenmodulserver/src/sql/SQL.java | 4 +- Dozentenmodulserver/src/util/XMLCreator.java | 213 +++++++++++++++++++++ Dozentenmodulserver/thrift/server.thrift | 2 +- 268 files changed, 510 insertions(+), 93 deletions(-) create mode 100644 Dozentenmodulserver/bin/util/XMLCreator.class create mode 100644 Dozentenmodulserver/src/util/XMLCreator.java (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index 7dd90d89..fe7cbc2f 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class index 3aa6d518..ba01d472 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class index 968c8af7..9a60b2bb 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class index 6750763b..7ef0c949 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class index 57ddab82..1e1426e0 100644 Binary files a/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EingabeVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class index 9dd8d00c..1098273e 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class index 3a3714a5..ea94db00 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class index 905d3fde..9e658891 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class index 4b544121..e8031c6b 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class index c4594204..8a248b02 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class index 556db5fc..71928437 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class index 64da3d54..52709eee 100644 Binary files a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class and b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class index 1275514d..c2ded647 100644 Binary files a/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class and b/Dozentenmodul/bin/GUI/LinkImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class index 3ba048a4..a0cfa528 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$1.class and b/Dozentenmodul/bin/GUI/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class index 4c73519c..ff56145f 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$2.class and b/Dozentenmodul/bin/GUI/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class index 9d555d1d..aad19364 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI$3.class and b/Dozentenmodul/bin/GUI/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/Login_GUI.class b/Dozentenmodul/bin/GUI/Login_GUI.class index 621e1e3f..c784876c 100644 Binary files a/Dozentenmodul/bin/GUI/Login_GUI.class and b/Dozentenmodul/bin/GUI/Login_GUI.class differ diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class index 8c7815e5..49a2be85 100644 Binary files a/Dozentenmodul/bin/Models/person.class and b/Dozentenmodul/bin/Models/person.class differ diff --git a/Dozentenmodul/bin/auth/Authentification.class b/Dozentenmodul/bin/auth/Authentification.class index e7a2611d..0d9b3144 100644 Binary files a/Dozentenmodul/bin/auth/Authentification.class and b/Dozentenmodul/bin/auth/Authentification.class differ diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class index f563788c..e0536990 100644 Binary files a/Dozentenmodul/bin/ftp/FTPUtility.class and b/Dozentenmodul/bin/ftp/FTPUtility.class differ diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class index 12ba0962..32bd6720 100644 Binary files a/Dozentenmodul/bin/ftp/UploadTask.class and b/Dozentenmodul/bin/ftp/UploadTask.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class index 7dd90d89..fe7cbc2f 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class index 95bbb104..dba15ce3 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class index 3aa6d518..ba01d472 100644 Binary files a/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class index 968c8af7..9a60b2bb 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class index 6750763b..7ef0c949 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class index 57ddab82..1e1426e0 100644 Binary files a/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EingabeVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class index 9dd8d00c..1098273e 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class index 3a3714a5..ea94db00 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class index 905d3fde..9e658891 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class index 4b544121..e8031c6b 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class index c4594204..8a248b02 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class index 556db5fc..71928437 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class index d6b733e8..290754eb 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class index 64da3d54..52709eee 100644 Binary files a/Dozentenmodul/bin/gui/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class index 1275514d..c2ded647 100644 Binary files a/Dozentenmodul/bin/gui/LinkImage_GUI$7.class and b/Dozentenmodul/bin/gui/LinkImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index 415f2233..a0cfa528 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index 6a03ae8e..ff56145f 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index d617ce42..aad19364 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index bc297a50..c784876c 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class index 8c7815e5..49a2be85 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java index 9eef919a..140d017b 100644 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditImageAllgemein_GUI extends JFrame { Vorname.setEditable(false); Vorname.setEnabled(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -137,7 +137,7 @@ public class EditImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -151,7 +151,7 @@ public class EditImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -165,7 +165,7 @@ public class EditImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java index 12678e0e..8fa942b7 100644 --- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java @@ -119,7 +119,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Vorname.setEnabled(false); Vorname.setEditable(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -133,7 +133,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -147,7 +147,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -161,7 +161,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java index 2e2c60c3..6bc55553 100644 --- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); @@ -222,11 +222,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); @@ -245,11 +245,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_GUI(); diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java index 702b7f67..e702dc4a 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java @@ -299,7 +299,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - task = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this); + task = new DownloadTask(host, port, user.userName, user.password,user.path, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun=true; diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java index 078f8075..8c26999d 100644 --- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java @@ -15,6 +15,9 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -38,6 +41,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import util.XMLCreator; import ftp.UploadTask; @@ -348,9 +352,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter=new SimpleDateFormat("yyyMMddhhmmss"); + + System.out.println(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); + Image.image.setNewName(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); - + task.addPropertyChangeListener(this); task.execute(); taskrun=true; @@ -405,7 +412,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu()); + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), "/srv/openslx/nfs/temp/"+Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/GUI/LinkImage_GUI.java index 38b3d5e3..b8b1920e 100644 --- a/Dozentenmodul/src/GUI/LinkImage_GUI.java +++ b/Dozentenmodul/src/GUI/LinkImage_GUI.java @@ -359,7 +359,7 @@ public class LinkImage_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); - client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java index cc558261..c3987526 100644 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ b/Dozentenmodul/src/GUI/Login_GUI.java @@ -27,7 +27,17 @@ import javax.swing.border.EmptyBorder; import models.person; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.protocol.TProtocol; import org.ini4j.Wini; +import thrift.AuthenticationException; +import thrift.ImageServer; +import thrift.InvalidTokenException; +import thrift.SessionData; +import thrift.MasterThriftConnection; +import thrift.ImageServer.Client; +import thrift.UserInfo; import config.config_file; @@ -145,6 +155,26 @@ public class Login_GUI extends JFrame { //Ldap check=new Ldap(); boolean login=true; //boolean login=check.LdapAuth(username.getText(), new String(pass.getPassword())); + MasterThriftConnection thrift=new MasterThriftConnection(); + Client client=thrift.getMasterThriftConnection(); + String token=null; + final thrift.SessionData result; + try { + String passText = new String(pass.getPassword()); + System.out.println(username.getText()+" "+passText); + result = client.authenticate(username.getText(), passText); + + } catch (thrift.AuthenticationException e) { + System.out.println("Authentifizierung fehlgeschlagen: " + + e.message); + return; + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return; + } + System.out.println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId + ", mein Token für den Satelliten " + result.authToken); + token = result.authToken; if(login==true) { @@ -168,17 +198,22 @@ public class Login_GUI extends JFrame { } else { - person.verantowrtlicher.setName("Spitzer"); - person.verantowrtlicher.setVorname("Tobias"); - person.verantowrtlicher.setEMail("tspitzer@hs-offenburg.de"); - person.verantowrtlicher.setHochschule("HS Offenburg"); + UserInfo user=client.getUserFromToken(token); + + String hochschule=user.eMail.substring(user.eMail.indexOf("@")+1,user.eMail.indexOf(".")); + //System.out.println(hochschule); + person.verantwortlicher.setUsername(username.getText()); + person.verantwortlicher.setName(user.lastName); + person.verantwortlicher.setVorname(user.firstName); + person.verantwortlicher.setEMail(user.eMail); + person.verantwortlicher.setHochschule(hochschule); //Öffne das Hauprmenü MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); setVisible(false); } } - } catch (IOException e) { + } catch (IOException | TException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index f4dd5c22..24ab16f3 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -3,6 +3,7 @@ package models; public class person{ + private String username; private String Name; private String Vorname; private String Hochschule; @@ -12,9 +13,15 @@ public class person{ private boolean ischecked; - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); + public static person verantwortlicher=new person(); + + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } public String getName() { return Name; } diff --git a/Dozentenmodul/src/auth/Authentification.java b/Dozentenmodul/src/auth/Authentification.java index cf1a4b04..41f69502 100644 --- a/Dozentenmodul/src/auth/Authentification.java +++ b/Dozentenmodul/src/auth/Authentification.java @@ -1,5 +1,12 @@ package auth; +import thrift.UserInfo; + public class Authentification { + public boolean auth(String username, String pass) + { + return false; + + } } diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index c62ba07d..7824440a 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -6,6 +6,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.SocketException; import java.security.NoSuchAlgorithmException; + +import models.Image; + import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; @@ -138,9 +141,10 @@ public class FTPUtility { if (!success) { throw new FTPException("Could not set binary file type."); } - - outputStream = ftpClient.storeFileStream(uploadFile.getName()); - // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname()); + + outputStream = ftpClient.storeFileStream(Image.image.getNewName()); + + //ftpClient.rename(uploadFile.getName(), ); } catch (IOException ex) { throw new FTPException("Error uploading file: " + ex.getMessage()); } diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index e5d8a817..67706169 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -19,7 +19,7 @@ public class UploadTask extends SwingWorker { private int port; private String username; private String password; - + private String destDir; private File uploadFile; @@ -31,6 +31,7 @@ public class UploadTask extends SwingWorker { this.password = password; this.destDir = destDir; this.uploadFile = uploadFile; + } /** diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java index 9eef919a..140d017b 100644 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditImageAllgemein_GUI extends JFrame { Vorname.setEditable(false); Vorname.setEnabled(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -137,7 +137,7 @@ public class EditImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -151,7 +151,7 @@ public class EditImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -165,7 +165,7 @@ public class EditImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java index ce2130c5..8bd57eac 100644 --- a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); diff --git a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java index 12678e0e..8fa942b7 100644 --- a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java @@ -119,7 +119,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Vorname.setEnabled(false); Vorname.setEditable(false); Vorname.setBackground(Color.WHITE); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); @@ -133,7 +133,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Nachname.setEnabled(false); Nachname.setEditable(false); Nachname.setBackground(Color.WHITE); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); @@ -147,7 +147,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { Hochschule.setEnabled(false); Hochschule.setEditable(false); Hochschule.setBackground(Color.WHITE); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); @@ -161,7 +161,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { EMail.setEnabled(false); EMail.setEditable(false); EMail.setBackground(Color.WHITE); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); diff --git a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java index 2e2c60c3..6bc55553 100644 --- a/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java @@ -123,7 +123,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); - Vorname.setText(person.verantowrtlicher.getVorname()); + Vorname.setText(person.verantwortlicher.getVorname()); Vorname.setBackground(Color.WHITE); Vorname.setColumns(10); Vorname.setBounds(145, 33, 350, 20); @@ -137,7 +137,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); - Nachname.setText(person.verantowrtlicher.getName()); + Nachname.setText(person.verantwortlicher.getName()); Nachname.setBackground(Color.WHITE); Nachname.setColumns(10); Nachname.setBounds(145, 64, 350, 20); @@ -151,7 +151,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); - Hochschule.setText(person.verantowrtlicher.getHochschule()); + Hochschule.setText(person.verantwortlicher.getHochschule()); Hochschule.setBackground(Color.WHITE); Hochschule.setColumns(10); Hochschule.setBounds(145, 95, 350, 20); @@ -165,7 +165,7 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); - EMail.setText(person.verantowrtlicher.getEMail()); + EMail.setText(person.verantwortlicher.getEMail()); EMail.setBackground(Color.WHITE); EMail.setColumns(10); EMail.setBounds(145, 126, 350, 20); @@ -222,11 +222,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); @@ -245,11 +245,11 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) { - person.verantowrtlicher.setVorname(Vorname.getText()); - person.verantowrtlicher.setName(Nachname.getText()); - person.verantowrtlicher.setEMail(EMail.getText()); + person.verantwortlicher.setVorname(Vorname.getText()); + person.verantwortlicher.setName(Nachname.getText()); + person.verantwortlicher.setEMail(EMail.getText()); - person.verantowrtlicher.setHochschule(Hochschule.getText()); + person.verantwortlicher.setHochschule(Hochschule.getText()); EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_GUI(); diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java index 702b7f67..e702dc4a 100644 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java @@ -299,7 +299,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - task = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this); + task = new DownloadTask(host, port, user.userName, user.password,user.path, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun=true; diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java index 0bf92b82..fd11697c 100644 --- a/Dozentenmodul/src/gui/FTPUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPUploader_GUI.java @@ -15,6 +15,9 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -38,6 +41,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import util.XMLCreator; import ftp.UploadTask; @@ -348,9 +352,12 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter=new SimpleDateFormat("yyyMMddhhmmss"); + + System.out.println(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); + Image.image.setNewName(formatter.format(new Date())+"_"+person.verantwortlicher.getHochschule()+"_"+person.verantwortlicher.getUsername()+"_"+Image.image.getImagename()+".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); - + task.addPropertyChangeListener(this); task.execute(); taskrun=true; @@ -405,7 +412,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { - client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu()); + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), "/srv/openslx/nfs/temp/"+Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/LinkImage_GUI.java b/Dozentenmodul/src/gui/LinkImage_GUI.java index 38b3d5e3..b8b1920e 100644 --- a/Dozentenmodul/src/gui/LinkImage_GUI.java +++ b/Dozentenmodul/src/gui/LinkImage_GUI.java @@ -359,7 +359,7 @@ public class LinkImage_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); - client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index 58d1d104..c3987526 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -33,9 +33,11 @@ import org.apache.thrift.protocol.TProtocol; import org.ini4j.Wini; import thrift.AuthenticationException; import thrift.ImageServer; +import thrift.InvalidTokenException; import thrift.SessionData; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.UserInfo; import config.config_file; @@ -161,6 +163,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText()+" "+passText); result = client.authenticate(username.getText(), passText); + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); @@ -195,17 +198,22 @@ public class Login_GUI extends JFrame { } else { - person.verantowrtlicher.setName("Spitzer"); - person.verantowrtlicher.setVorname("Tobias"); - person.verantowrtlicher.setEMail("tspitzer@hs-offenburg.de"); - person.verantowrtlicher.setHochschule("HS Offenburg"); + UserInfo user=client.getUserFromToken(token); + + String hochschule=user.eMail.substring(user.eMail.indexOf("@")+1,user.eMail.indexOf(".")); + //System.out.println(hochschule); + person.verantwortlicher.setUsername(username.getText()); + person.verantwortlicher.setName(user.lastName); + person.verantwortlicher.setVorname(user.firstName); + person.verantwortlicher.setEMail(user.eMail); + person.verantwortlicher.setHochschule(hochschule); //Öffne das Hauprmenü MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); setVisible(false); } } - } catch (IOException e) { + } catch (IOException | TException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index f4dd5c22..24ab16f3 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -3,6 +3,7 @@ package models; public class person{ + private String username; private String Name; private String Vorname; private String Hochschule; @@ -12,9 +13,15 @@ public class person{ private boolean ischecked; - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); + public static person verantwortlicher=new person(); + + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } public String getName() { return Name; } diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 865c5b26..54ae8fb1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index 80af0891..dcf9e658 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 02191978..636d50e6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 41e05b62..52b62ee2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 64c048eb..47bcd119 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index 7eb94853..b9cb1ea4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index fe7c807b..2e0afed7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index c374d0d4..cd52da88 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 7cac2bf0..2c9e4c7e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 550eff24..590c2bcd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index 9598d144..7f8ae8c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index d66713c3..ad0574c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 293650a5..13538c1f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 09e66793..635c53c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index a562e259..3f738078 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class index c67fc9b7..6290a004 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 8390ce15..ba289f63 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class index 115f41de..3fbb8677 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index cae2f5fe..edb1bcec 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class index 131adf41..40306c0d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index afda8e77..c732068a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class index eb3d7333..45589df3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index 2f2a3426..b6a19652 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class index 2c999000..7088768e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index 35ca3d88..aa7ecc5b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class index 4f5763ec..dd89977c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index dc9ab4c5..705a33c7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class index 84d6c9e5..89af670d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 3d8425c0..2471001a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class index 884944a8..693325cd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index c98b333e..ae81f238 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class index 3705e516..61e06f52 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index 2ca1a1df..b2db8d99 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class index 47b8e46f..c2c2ca58 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index bb0c6ef5..2d438884 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class index 8421168b..f2b57fb7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index d6ae2a96..60246d3e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class index b466b220..c495d813 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index c37b1f7d..08f594ca 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index f847f005..31a856b1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index c127f59d..2fed4f2f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index eb173739..0fb66c0d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index 7619d485..ce5024d6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index c638782e..cda02dce 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index a09806dd..a53a5690 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 52c9150d..4c817ea4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index cf27e205..0485efb4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index e1257cfa..06122d58 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index 4fc3825c..a39d1d63 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index 802da8e5..69232dd9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 791c1333..6b95e144 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index 0af91fe9..b48d1db8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index 40f4e483..ba4b4c81 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index 0d1c85df..974ce04a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index e36dd7e0..af38e742 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index a9280272..a190c32b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index ab3c6465..890e8213 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index f01b8def..8d491ab8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index c1f3775d..f48d16cd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 58eec36e..40177d04 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index c4d4f5ee..d10aedf6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 513cb0d2..8c9f3d14 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index d8ea9ee2..c3cfe04b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 3925c6b9..5af2dce3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 7564db76..94eec707 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index dee99a40..4b3ca880 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 5f9b476a..8cb3e809 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 9018a557..16a4aceb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index 38fa5f83..abae47eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 83f3cf8e..4b06ae93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index ad0bc085..d01fdf1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index 0ff8444c..bb5e97c4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index 45ee60d5..42042b94 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index e6ad4712..f4fabf54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index 382a537e..348ca927 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index dcf01354..22764a7a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 89f8b72c..6a582eda 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index 8dd34ef5..be92db51 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index aa5e6316..e3af306c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 0ec7dac0..77822f8b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index b69dc408..d290e233 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 91328e9e..087be9cb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 02940dcb..165ca1fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index 5f86bdc8..01f278f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index f1d1cfa2..078a92a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 1c6fb9a4..1e27cb2b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index d5a7e86d..cf9f1a46 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index efe1819b..910a07be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index c3676bbf..e0c90c41 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index dc4904de..ea0aac68 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 039ebffe..1dc1acbe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index 131d29d7..b2b736b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index 97d14f92..46040508 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index 45c69805..0261ca03 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index d1bc7f40..61f1504d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index 000e0b79..3968c27f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index 5dc4b215..87f255d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 9713ba03..6b0de404 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index e22a6d6c..0fddf45d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index ba6dc963..c33d93c8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 32b926fd..5a78bea3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 6216224d..0a37b52c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index ca75471d..b32073e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index 9e347289..c9602e72 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index 505b08fd..b094d83f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index bf7f4388..4e0eac29 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index e59b3eb1..37d2bfce 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index 2e5cd51e..d3a5e629 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 6ae8f580..677cf6e7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index 3037bfde..a0e50f65 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index 209cdbf6..de271782 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index e9f28cc0..2cff3f79 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index c3e7f646..caf4f5ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index c0ccadcb..4bc03b1b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index 7058999a..d421488d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index ec30a751..4eec1f61 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 9f8839a6..25714de2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 56972419..9878f82f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index f229733a..820047ed 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index ef8092ad..e2615b10 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index 378685c3..a99172e0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index d9acc643..a09507c2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index dd0ea27f..a9efd658 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index 768af62d..c5d3070a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index 2884c0ef..f84046fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index fad9e6cf..a0e39f19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index 3aa5101d..18f2f747 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 1743d6e3..23a1b04e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 94f89f93..2bf508fe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index af58ad80..72c0e132 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index 589d1eac..465e526f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 83275be9..99a1ca2c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 0ccdf005..3d83b674 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index 27e2cdde..cf401688 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 30a37f90..20c33f69 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index eff507b9..d39b5eaa 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index e1fb8aaa..cd64d091 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index 8fc9d0fd..a6a046a9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index ce9b9d5a..5ca4e662 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index d40d6f6f..22767aa5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 0785eb3c..8c3ee771 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index 6ee3bb0b..ec794b93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 2a084bcb..7f78ba17 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index 68eb9e16..80170c5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index b403d181..e36694de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index 0e9a44c2..bafaca4a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index d965843c..0e90f432 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index 96c47f13..fe9789e5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 0919dd40..472541ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index a9803ea5..5784027a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index fc815287..1a12ac16 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index a55a6649..3b6a1df1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index ab0ce7f1..11278b31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index 02b6271c..2a2b9950 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index 95396680..bbc8f5de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 5dc59685..0e463eef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index f437ee19..f6ac5397 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index 49232524..f8694799 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index 4c213e41..928375bd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index 32148d45..883e1b4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index a6c38c8e..435037e1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index 0ba35504..63574fda 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index 03302886..1503f186 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index 1dfd96b6..a1aecc8d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 48a50aca..8f15a17a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index eb220f7a..09aeb14d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index 2bfc9d6f..d6f97faf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 493ff2da..12c2a78a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index 146b829f..2b2ce43d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index 896331bf..631bfe6d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index 6b9c63b2..4fb7b29b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 7f8968fa..57bf3c1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 4ac7c7ad..21152e10 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index c28a7bda..7b995a7c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index 17c73d88..bb71f7a1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index b4febffd..4af3c48a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index 30a469ee..df06ff1d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index c6948e98..de652ba4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index 2032f256..f17f52a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index 0588cdc3..da9eda5a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index 8f908837..adb3ed9f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index cd0eb89b..ee51aabf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 2db33d20..36303474 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index ec89e575..718cff17 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index 35cf7466..adf5624f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index f12ae330..6e02ab65 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index 9fd7ae26..2190e109 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 8716ff0d..9dcbd40e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index da3218b4..eddcd8b6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index fab99021..b0441555 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index fdc67267..9360cad9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index ff06fe27..89beaed4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index f687206d..5e5afdca 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 4cc909be..94197262 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index 0c4be6ed..b3416972 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index 8f128702..ee35f096 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 34cf6756..0106166e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 1ed01a7e..8a73f7e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index ca0bfbb9..ed2fb7df 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index ac6489f4..3e78390a 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 1b1ee550..c2a0c5c9 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class new file mode 100644 index 00000000..579a4cd4 Binary files /dev/null and b/Dozentenmodulserver/bin/util/XMLCreator.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 18362ab7..9994fcb4 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String name) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; public List getImageList() throws org.apache.thrift.TException; @@ -70,7 +70,7 @@ public class Server { public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -178,13 +178,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException { - send_writeVLdata(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu); + send_writeVLdata(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); @@ -198,6 +198,7 @@ public class Server { args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); + args.setImagePath(imagePath); sendBase("writeVLdata", args); } @@ -525,9 +526,9 @@ public class Server { } } - public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -544,7 +545,8 @@ public class Server { private boolean internet; private long ram; private long cpu; - public writeVLdata_call(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String imagePath; + public writeVLdata_call(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; this.firstname = firstname; @@ -557,6 +559,7 @@ public class Server { this.internet = internet; this.ram = ram; this.cpu = cpu; + this.imagePath = imagePath; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -573,6 +576,7 @@ public class Server { args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); + args.setImagePath(imagePath); args.write(prot); prot.writeMessageEnd(); } @@ -1004,7 +1008,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu); + result.success = iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath); result.setSuccessIsSet(true); return result; } @@ -1403,7 +1407,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu,resultHandler); + iface.writeVLdata(args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath,resultHandler); } } @@ -3855,6 +3859,7 @@ public class Server { private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-9); private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-10); private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-11); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-12); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -3873,6 +3878,7 @@ public class Server { public boolean internet; // required public long ram; // required public long cpu; // required + public String imagePath; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -3886,7 +3892,8 @@ public class Server { LICENSE((short)-8, "license"), INTERNET((short)-9, "internet"), RAM((short)-10, "ram"), - CPU((short)-11, "cpu"); + CPU((short)-11, "cpu"), + IMAGE_PATH((short)-12, "imagePath"); private static final Map byName = new HashMap(); @@ -3923,6 +3930,8 @@ public class Server { return RAM; case -11: // CPU return CPU; + case -12: // IMAGE_PATH + return IMAGE_PATH; default: return null; } @@ -3993,6 +4002,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); tmpMap.put(_Fields.CPU, new org.apache.thrift.meta_data.FieldMetaData("cpu", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); + tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("imagePath", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeVLdata_args.class, metaDataMap); } @@ -4011,7 +4022,8 @@ public class Server { boolean license, boolean internet, long ram, - long cpu) + long cpu, + String imagePath) { this(); this.imagename = imagename; @@ -4029,6 +4041,7 @@ public class Server { setRamIsSet(true); this.cpu = cpu; setCpuIsSet(true); + this.imagePath = imagePath; } /** @@ -4061,6 +4074,9 @@ public class Server { this.internet = other.internet; this.ram = other.ram; this.cpu = other.cpu; + if (other.isSetImagePath()) { + this.imagePath = other.imagePath; + } } public writeVLdata_args deepCopy() { @@ -4084,6 +4100,7 @@ public class Server { this.ram = 0; setCpuIsSet(false); this.cpu = 0; + this.imagePath = null; } public String getImagename() { @@ -4346,6 +4363,30 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPU_ISSET_ID, value); } + public String getImagePath() { + return this.imagePath; + } + + public writeVLdata_args setImagePath(String imagePath) { + this.imagePath = imagePath; + return this; + } + + public void unsetImagePath() { + this.imagePath = null; + } + + /** Returns true if field imagePath is set (has been assigned a value) and false otherwise */ + public boolean isSetImagePath() { + return this.imagePath != null; + } + + public void setImagePathIsSet(boolean value) { + if (!value) { + this.imagePath = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -4436,6 +4477,14 @@ public class Server { } break; + case IMAGE_PATH: + if (value == null) { + unsetImagePath(); + } else { + setImagePath((String)value); + } + break; + } } @@ -4474,6 +4523,9 @@ public class Server { case CPU: return Long.valueOf(getCpu()); + case IMAGE_PATH: + return getImagePath(); + } throw new IllegalStateException(); } @@ -4507,6 +4559,8 @@ public class Server { return isSetRam(); case CPU: return isSetCpu(); + case IMAGE_PATH: + return isSetImagePath(); } throw new IllegalStateException(); } @@ -4623,6 +4677,15 @@ public class Server { return false; } + boolean this_present_imagePath = true && this.isSetImagePath(); + boolean that_present_imagePath = true && that.isSetImagePath(); + if (this_present_imagePath || that_present_imagePath) { + if (!(this_present_imagePath && that_present_imagePath)) + return false; + if (!this.imagePath.equals(that.imagePath)) + return false; + } + return true; } @@ -4749,6 +4812,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetImagePath()).compareTo(other.isSetImagePath()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImagePath()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imagePath, other.imagePath); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -4840,6 +4913,14 @@ public class Server { sb.append("cpu:"); sb.append(this.cpu); first = false; + if (!first) sb.append(", "); + sb.append("imagePath:"); + if (this.imagePath == null) { + sb.append("null"); + } else { + sb.append(this.imagePath); + } + first = false; sb.append(")"); return sb.toString(); } @@ -4973,6 +5054,14 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -12: // IMAGE_PATH + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.imagePath = iprot.readString(); + struct.setImagePathIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -4988,6 +5077,11 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.imagePath != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.imagePath); + oprot.writeFieldEnd(); + } oprot.writeFieldBegin(CPU_FIELD_DESC); oprot.writeI64(struct.cpu); oprot.writeFieldEnd(); @@ -5086,7 +5180,10 @@ public class Server { if (struct.isSetCpu()) { optionals.set(10); } - oprot.writeBitSet(optionals, 11); + if (struct.isSetImagePath()) { + optionals.set(11); + } + oprot.writeBitSet(optionals, 12); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } @@ -5120,12 +5217,15 @@ public class Server { if (struct.isSetCpu()) { oprot.writeI64(struct.cpu); } + if (struct.isSetImagePath()) { + oprot.writeString(struct.imagePath); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(11); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -5170,6 +5270,10 @@ public class Server { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } + if (incoming.get(11)) { + struct.imagePath = iprot.readString(); + struct.setImagePathIsSet(true); + } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 9715b0a4..44f0c216 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -15,10 +15,14 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; + import org.apache.commons.io.FileUtils; import org.apache.thrift.TException; import sql.SQL; +import util.XMLCreator; public class ServerHandler implements Server.Iface { @@ -74,7 +78,7 @@ public class ServerHandler implements Server.Iface { @Override public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, - String Fak, boolean license, boolean internet, long ram, long cpu) + String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws TException { String login="tete"; @@ -82,8 +86,8 @@ public class ServerHandler implements Server.Iface { int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); - sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename); - + sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename, imagePath); + // TODO Auto-generated method stub return true; } @@ -184,7 +188,20 @@ public class ServerHandler implements Server.Iface { System.out.println(startDate); sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive); - + XMLCreator xml=new XMLCreator(con, name); + try { + xml.create(name); + System.out.println("creator durch"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ParserConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (TransformerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 301c7d88..7eca6952 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -160,7 +160,7 @@ public class SQL { return -1; } - public boolean setImageData(Connection con, int pk_person, boolean license, boolean internet, long cpu, long ram, String imagename) + public boolean setImageData(Connection con, int pk_person, boolean license, boolean internet, long cpu, long ram, String imagename, String imagePath) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -180,7 +180,7 @@ public class SQL { Statement stm=con.createStatement(); Random random=new Random(); int uid=random.nextInt(); - stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('"+uid+"',1,'"+imagename+"','/srv/openslx/nfs/temp/','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"',1,1,1,1,1,1,0,0,'"+license_bol+"','"+internet_bol+"','"+ram+"','"+cpu+"');"); + stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('"+uid+"',1,'"+imagename+"','"+imagePath+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"',1,1,1,1,1,1,0,0,'"+license_bol+"','"+internet_bol+"','"+ram+"','"+cpu+"');"); con.commit(); } catch (SQLException e) { diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java new file mode 100644 index 00000000..0efb2465 --- /dev/null +++ b/Dozentenmodulserver/src/util/XMLCreator.java @@ -0,0 +1,213 @@ +package util; +import java.io.File; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Comment; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + + +public class XMLCreator { + + + /* This class offers methods to create XML files for the (old) version of managing VMware *.vmdks */ + + + + private Connection con = null; + private Statement st = null; + private ResultSet rs = null; + private String vmName; + private String filePath = "/srv/openslx/nfs/temp/"; + + + //phone param not existing + private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.name as os, m_VLData_lecture.admin_changeTime as time " + + "FROM bwLehrpool.m_VLData_lecture, bwLehrpool.m_VLData_imageInfo, bwLehrpool.m_user, bwLehrpool.m_operatingSystem " + + "WHERE m_user.userID = m_VLData_lecture.admin_owner " + + "AND m_VLData_imageInfo.GUID_imageID = m_VLData_lecture.imageID " + + "AND m_VLData_imageInfo.content_operatingSystem = m_operatingSystem.operatingSystemID " + + "AND m_VLData_lecture.name = "; + + + + public XMLCreator(Connection con) + { + this.con = con; + } + + public XMLCreator(Connection con, String vmName) + { + this.con = con; + this.vmName = vmName; + } + + + public boolean create() throws SQLException, ParserConfigurationException, TransformerException + { + + //System.out.println(query); + + if(con == null || vmName == null) + { + return false; + } + query += "'" + this.vmName + "';"; + + boolean success = startCreation(); + + if(success) + { + return true; + } + + return false; + + } + + //overload method for dynamic setting of param vmName instead of static context above + public boolean create(String vmName) throws SQLException, ParserConfigurationException, TransformerException + { + //System.out.println(query); + + if(con == null || vmName == null) + { + return false; + } + query += "'" + vmName + "';"; + + boolean success = startCreation(); + + if(success) + { + return true; + } + return false; + } + + + private boolean startCreation() throws SQLException, ParserConfigurationException, TransformerException + { + //get needed data from database + st = con.createStatement(); + rs = st.executeQuery(query); + rs.next(); + + //factory + DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); + + // root elements - dynamic content + Document doc = docBuilder.newDocument(); + Element rootElement = doc.createElement("settings"); + doc.appendChild(rootElement); + + Element entry = doc.createElement("eintrag"); + rootElement.appendChild(entry); + + Element prio = doc.createElement("priority"); + entry.appendChild(prio); + prio.setAttribute("param", "0"); + + Comment fComment = doc.createComment("Diesen Abschnitt ergänzen"); + entry.appendChild(fComment); + + Element imgName = doc.createElement("image_name"); + entry.appendChild(imgName); + String imagePath=rs.getString("image_path").substring(rs.getString("image_path").lastIndexOf("/")); + + imgName.setAttribute("param", imagePath); + + Element creator = doc.createElement("creator"); + entry.appendChild(creator); + creator.setAttribute("param", (rs.getString("vorname") + " " + rs.getString("nachname"))); + + Element email = doc.createElement("email"); + entry.appendChild(email); + email.setAttribute("param", rs.getString("mail")); + + //TODO check whether necessary + Element phone = doc.createElement("phone"); + entry.appendChild(phone); + phone.setAttribute("param", ""); + + Element shortDesc = doc.createElement("short_description"); + entry.appendChild(shortDesc); + shortDesc.setAttribute("param", rs.getString("shortdescription")); + + //TODO append latest change date and time + Element longDesc = doc.createElement("long_description"); + entry.appendChild(longDesc); + longDesc.setAttribute("param", rs.getString("description") + " last update: " + rs.getString("time")); + + Element os = doc.createElement("os"); + entry.appendChild(os); + os.setAttribute("param", rs.getString("os")); + + Comment sComment = doc.createComment("Diesen Abschnitt ergänzen"); + entry.appendChild(sComment); + + + //static content following - second part of xml descriptor + + + Element netwParam = doc.createElement("network"); + entry.appendChild(netwParam); + netwParam.setAttribute("param", "nat"); + + Element netcParam = doc.createElement("netcard"); + entry.appendChild(netcParam); + netcParam.setAttribute("param", "e1000"); + + + Element vm = doc.createElement("virtualmachine"); + entry.appendChild(vm); + vm.setAttribute("param", "vmware"); + + //TODO Fallunterscheidung + Element icon = doc.createElement("icon"); + entry.appendChild(icon); + icon.setAttribute("param", "windows"); + + Element active = doc.createElement("active"); + entry.appendChild(active); + active.setAttribute("param", "true"); + + Element pools = doc.createElement("pools"); + entry.appendChild(pools); + pools.setAttribute("param", "default"); + + Element enable3d = doc.createElement("enable3d"); + entry.appendChild(enable3d); + enable3d.setAttribute("param", "true"); + + + + //write virtual document to file + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + DOMSource source = new DOMSource(doc); + + StreamResult result = new StreamResult(new File(filePath+imagePath.replace("vmdk", "xml"))); //see filepath at top of class + transformer.transform(source, result); + + //cleanup + rs.close(); + st.close(); + + //return + return true; + } +} diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 75f9c26b..4c9e51fa 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -25,7 +25,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string name), - bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu), + bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), list getImageList(), list getAllOS(), map getPersonData(string Vorname, string Nachname), -- cgit v1.2.3-55-g7522 From 7a31f13cd386669298dfa0f91f90af63c9c2874a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Apr 2014 12:03:03 +0200 Subject: Bearbeiten von Images funktioniert nun vollständig --- .../bin/GUI/EditImageAllgemein_GUI$1.class | Bin 716 -> 837 bytes .../bin/GUI/EditImageAllgemein_GUI$2.class | Bin 793 -> 914 bytes .../bin/GUI/EditImageAllgemein_GUI$3.class | Bin 833 -> 954 bytes .../bin/GUI/EditImageAllgemein_GUI$4.class | Bin 1841 -> 1841 bytes Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class | Bin 9064 -> 9064 bytes .../bin/GUI/EditImageTechnisch_GUI$1.class | Bin 716 -> 716 bytes .../bin/GUI/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/GUI/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/GUI/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class | Bin 8401 -> 8401 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class | Bin 1237 -> 1361 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class | Bin 1206 -> 1206 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class | Bin 749 -> 749 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class | Bin 1263 -> 1515 bytes Dozentenmodul/bin/GUI/FTPDownloader_GUI.class | Bin 9431 -> 9476 bytes Dozentenmodul/bin/GUI/MainMenue_GUI.class | Bin 10767 -> 10763 bytes Dozentenmodul/bin/Models/vm.class | Bin 2060 -> 0 bytes .../bin/gui/EditImageAllgemein_GUI$1.class | Bin 716 -> 837 bytes .../bin/gui/EditImageAllgemein_GUI$2.class | Bin 793 -> 914 bytes .../bin/gui/EditImageAllgemein_GUI$3.class | Bin 833 -> 954 bytes .../bin/gui/EditImageAllgemein_GUI$4.class | Bin 1841 -> 1841 bytes Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class | Bin 9064 -> 9064 bytes .../bin/gui/EditImageTechnisch_GUI$1.class | Bin 716 -> 716 bytes .../bin/gui/EditImageTechnisch_GUI$2.class | Bin 793 -> 793 bytes .../bin/gui/EditImageTechnisch_GUI$3.class | Bin 1623 -> 1623 bytes .../bin/gui/EditImageTechnisch_GUI$4.class | Bin 1611 -> 1611 bytes Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class | Bin 8401 -> 8401 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class | Bin 1237 -> 1361 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class | Bin 1206 -> 1206 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class | Bin 749 -> 749 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class | Bin 1263 -> 1515 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class | Bin 805 -> 0 bytes Dozentenmodul/bin/gui/FTPDownloader_GUI.class | Bin 9431 -> 9476 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class | Bin 758 -> 758 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class | Bin 1217 -> 1217 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class | Bin 1336 -> 1336 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class | Bin 763 -> 763 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class | Bin 1473 -> 1473 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class | Bin 1599 -> 1599 bytes Dozentenmodul/bin/gui/FTPEditUploader_GUI.class | Bin 10407 -> 10892 bytes Dozentenmodul/bin/gui/Login_GUI$1.class | Bin 1082 -> 1082 bytes Dozentenmodul/bin/gui/Login_GUI$2.class | Bin 635 -> 635 bytes Dozentenmodul/bin/gui/Login_GUI$3.class | Bin 647 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$4.class | Bin 647 -> 647 bytes Dozentenmodul/bin/gui/Login_GUI$5.class | Bin 644 -> 644 bytes Dozentenmodul/bin/gui/Login_GUI.class | Bin 7734 -> 7734 bytes Dozentenmodul/bin/gui/MainMenue_GUI.class | Bin 10767 -> 10763 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class | Bin 819 -> 819 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class | Bin 1249 -> 1249 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class | Bin 887 -> 887 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class | Bin 1252 -> 1252 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class | Bin 896 -> 896 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class | Bin 1340 -> 1729 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class | Bin 935 -> 1839 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class | Bin 938 -> 938 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class | Bin 1608 -> 1970 bytes Dozentenmodul/bin/gui/SearchEditImage_GUI.class | Bin 11819 -> 11819 bytes Dozentenmodul/bin/models/SessionData.class | Bin 0 -> 1041 bytes Dozentenmodul/bin/models/vm.class | Bin 2060 -> 0 bytes Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java | 4 +- Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java | 1 + Dozentenmodul/src/GUI/FTPDownloader_GUI.java | 44 ++-- Dozentenmodul/src/GUI/Login_GUI.java | 7 +- Dozentenmodul/src/GUI/MainMenue_GUI.java | 2 +- Dozentenmodul/src/Models/vm.java | 69 ------ Dozentenmodul/src/gui/EditImageAllgemein_GUI.java | 4 +- Dozentenmodul/src/gui/EditImageTechnisch_GUI.java | 1 + Dozentenmodul/src/gui/FTPDownloader_GUI.java | 44 ++-- Dozentenmodul/src/gui/FTPEditUploader_GUI.java | 11 +- Dozentenmodul/src/gui/Login_GUI.java | 7 +- Dozentenmodul/src/gui/MainMenue_GUI.java | 2 +- Dozentenmodul/src/gui/SearchEditImage_GUI.java | 73 ++++--- Dozentenmodul/src/models/SessionData.java | 28 +++ Dozentenmodul/src/models/vm.java | 69 ------ .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 2993 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 2945 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 3332 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 3246 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3157 -> 3267 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 3863 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4410 -> 4410 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4241 -> 4241 bytes .../bin/server/Server$AsyncClient.class | Bin 7922 -> 7947 bytes .../bin/server/Server$AsyncIface.class | Bin 1425 -> 1425 bytes .../Server$AsyncProcessor$DeleteFtpUser$1.class | Bin 2969 -> 2969 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS$1.class | Bin 2997 -> 2997 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../Server$AsyncProcessor$getFtpUser$1.class | Bin 2851 -> 2851 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData$1.class | Bin 3081 -> 3081 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList$1.class | Bin 3021 -> 3021 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData$1.class | Bin 3099 -> 3099 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getPathOfImage$1.class | Bin 2907 -> 2907 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3128 -> 3174 bytes .../Server$AsyncProcessor$getPersonData$1.class | Bin 3090 -> 3090 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy$1.class | Bin 2984 -> 2984 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData$1.class | Bin 3002 -> 3002 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3367 bytes .../Server$AsyncProcessor$writeLecturedata$1.class | Bin 3011 -> 3011 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3648 -> 3648 bytes .../Server$AsyncProcessor$writeVLdata$1.class | Bin 2966 -> 2966 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3490 -> 3490 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3280 -> 3280 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 14082 -> 14166 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 1595 -> 1613 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 2036 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2014 -> 2060 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 2279 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2563 -> 2563 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2390 -> 2390 bytes .../bin/server/Server$Processor.class | Bin 3113 -> 3113 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3462 -> 3462 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 10610 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3007 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2640 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2124 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 9481 -> 10797 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 3587 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 3944 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3289 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 18468 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4053 -> 4053 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 4862 -> 4862 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4056 -> 4056 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 24604 -> 24604 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3914 -> 3914 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4637 -> 4637 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 3886 -> 3886 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 23310 -> 23310 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 9540 -> 9802 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 11593 -> 11637 bytes Dozentenmodulserver/src/server/Server.java | 238 +++++++++++++++------ Dozentenmodulserver/src/server/ServerHandler.java | 16 +- Dozentenmodulserver/src/sql/SQL.java | 4 +- Dozentenmodulserver/thrift/server.thrift | 2 +- 279 files changed, 334 insertions(+), 292 deletions(-) delete mode 100644 Dozentenmodul/bin/Models/vm.class delete mode 100644 Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class create mode 100644 Dozentenmodul/bin/models/SessionData.class delete mode 100644 Dozentenmodul/bin/models/vm.class delete mode 100644 Dozentenmodul/src/Models/vm.java create mode 100644 Dozentenmodul/src/models/SessionData.java delete mode 100644 Dozentenmodul/src/models/vm.java (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class index e01e6b79..062a5aeb 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class index dc948767..9d0a3bea 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class index e248fd06..69507f5e 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class index 051431f2..e7af4c13 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class index c0a38325..2287ca1a 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class index b17e4eea..3ed6a8ca 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class index dcfd7111..c334f61e 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class index a0a6173c..0c45cb47 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class index f5d01268..6b0b0760 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class index 21658851..182e34ea 100644 Binary files a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class index dabb4fbf..3067718e 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class index f030114b..41ad1e3f 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class index b1f9edc1..2af3aa99 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class index fbed3457..6f093d26 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class index a6af82a6..0d64e048 100644 Binary files a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class and b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class index b39b43af..9c8c5535 100644 Binary files a/Dozentenmodul/bin/GUI/MainMenue_GUI.class and b/Dozentenmodul/bin/GUI/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/Models/vm.class b/Dozentenmodul/bin/Models/vm.class deleted file mode 100644 index 58709544..00000000 Binary files a/Dozentenmodul/bin/Models/vm.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class index e01e6b79..062a5aeb 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class index dc948767..9d0a3bea 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class index e248fd06..69507f5e 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class index 051431f2..e7af4c13 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class index c0a38325..2287ca1a 100644 Binary files a/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class index b17e4eea..3ed6a8ca 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class index dcfd7111..c334f61e 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class index a0a6173c..0c45cb47 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class index f5d01268..6b0b0760 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class index 21658851..182e34ea 100644 Binary files a/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class index dabb4fbf..3067718e 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class index f030114b..41ad1e3f 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class index b1f9edc1..2af3aa99 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class index fbed3457..6f093d26 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class deleted file mode 100644 index ffe0c1c4..00000000 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI$5.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class index a6af82a6..0d64e048 100644 Binary files a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class index 9fa18b77..3f952241 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class index c79031a8..0bff908a 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class index dc628f0a..7bafe65d 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class index 7aa1908d..a0883626 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class index 01834329..034411c3 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class index 9ebb41ee..043a33a4 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class index fc6e665a..a3da591f 100644 Binary files a/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$1.class b/Dozentenmodul/bin/gui/Login_GUI$1.class index 47818348..b4388d57 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$1.class and b/Dozentenmodul/bin/gui/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$2.class b/Dozentenmodul/bin/gui/Login_GUI$2.class index 41243cbe..54cd4d69 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$2.class and b/Dozentenmodul/bin/gui/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$3.class b/Dozentenmodul/bin/gui/Login_GUI$3.class index 3122e95a..46796de6 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$3.class and b/Dozentenmodul/bin/gui/Login_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$4.class b/Dozentenmodul/bin/gui/Login_GUI$4.class index 25dcca5e..22908f76 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$4.class and b/Dozentenmodul/bin/gui/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI$5.class b/Dozentenmodul/bin/gui/Login_GUI$5.class index 102f386f..e1bf5be2 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI$5.class and b/Dozentenmodul/bin/gui/Login_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/Login_GUI.class b/Dozentenmodul/bin/gui/Login_GUI.class index 90a674be..da10a7ca 100644 Binary files a/Dozentenmodul/bin/gui/Login_GUI.class and b/Dozentenmodul/bin/gui/Login_GUI.class differ diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class index b39b43af..9c8c5535 100644 Binary files a/Dozentenmodul/bin/gui/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class index f7677e0d..4c8a49ba 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class index 0e0f3195..0bb68dce 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class index 3764900b..414b3a0c 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class index e446614e..8ec22cf9 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class index 1f2e2007..1758ada3 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class index ae739673..b89857f4 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class index 5ff30dec..ca1774f7 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class index 2b56e122..08d744bd 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class index 92895e7c..00e112de 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class index ae28eddc..c562cc42 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/models/SessionData.class b/Dozentenmodul/bin/models/SessionData.class new file mode 100644 index 00000000..f0ff4996 Binary files /dev/null and b/Dozentenmodul/bin/models/SessionData.class differ diff --git a/Dozentenmodul/bin/models/vm.class b/Dozentenmodul/bin/models/vm.class deleted file mode 100644 index 58709544..00000000 Binary files a/Dozentenmodul/bin/models/vm.class and /dev/null differ diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/GUI/Login_GUI.java +++ b/Dozentenmodul/src/GUI/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java index 621f6561..e68e4bbd 100644 --- a/Dozentenmodul/src/GUI/MainMenue_GUI.java +++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + "\"Programmieren\"."); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png"))); + .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png"))); // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/Models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java index 34009fc7..1d30e9d0 100644 --- a/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java @@ -67,6 +67,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); System.exit(0); } }); @@ -216,6 +217,7 @@ public class EditImageAllgemein_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -254,7 +256,7 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); - + con.closeThriftConnection(); MainMenue_GUI sr=new MainMenue_GUI(); sr.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java index e6d78898..3c6109ae 100644 --- a/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java @@ -65,6 +65,7 @@ public class EditImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { //Beendet die Anwendung bei Klick auf das X + System.exit(0); } diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java index b36f0818..cb53fc3d 100644 --- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java @@ -31,6 +31,8 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; +import models.Image; + import org.apache.thrift.TException; import server.Server.Client; @@ -51,7 +53,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener int port = 21; String username = "openslx"; String password = "openslx-ng"; - String downloadPath = ""; + String downloadFile = ""; static String arg = ""; DownloadTask task; JLabel bytesreadlbl; @@ -64,7 +66,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener boolean taskrun = false; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); - JButton continueButton = new JButton("Fertigstellen"); + JButton buttonback = new JButton("Zur\u00FCck"); /** * Launch the application. @@ -86,6 +88,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); + thrift.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -108,7 +111,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e.printStackTrace(); } - // filename=name; + setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp*"); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); @@ -263,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane, BorderLayout.SOUTH); { - continueButton.setEnabled(false); - continueButton.addActionListener(new ActionListener() { + buttonback.setEnabled(false); + buttonback.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (taskrun == true) { task.cancel(true); @@ -275,24 +278,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener e1.printStackTrace(); } } + thrift.closeThriftConnection(); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); - - JButton cancelButton = new JButton("Zur\u00FCck"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - dispose(); - MainMenue_GUI m = new MainMenue_GUI(); - m.setVisible(true); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - continueButton.setActionCommand("Cancel"); - buttonPane.add(continueButton); + buttonback.setActionCommand("Cancel"); + buttonPane.add(buttonback); } } setVisible(true); @@ -305,14 +298,16 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - // downloadPath=client.getPathOfImage(filename); + + downloadFile=client.getPathOfImage(Image.image.getImageId(),Image.image.getVersion()); + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); } - + task = new DownloadTask(host, port, user.userName, user.password, - user.path, lblNewLabel.getText(), this); + downloadFile, lblNewLabel.getText(), this); task.addPropertyChangeListener(this); task.execute(); taskrun = true; @@ -326,9 +321,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); if (progress == 100) { - continueButton.setEnabled(true); + buttonback.setEnabled(true); } } + if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ diff --git a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java index 9f073993..e7252898 100644 --- a/Dozentenmodul/src/gui/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPEditUploader_GUI.java @@ -15,6 +15,10 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -30,6 +34,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -348,7 +353,11 @@ public class FTPEditUploader_GUI extends JFrame implements PropertyChangeListene // TODO Auto-generated catch block e.printStackTrace(); } - + DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile); task.addPropertyChangeListener(this); diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java index 8ad73e20..172895d6 100644 --- a/Dozentenmodul/src/gui/Login_GUI.java +++ b/Dozentenmodul/src/gui/Login_GUI.java @@ -23,6 +23,8 @@ import javax.swing.JTextField; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + +import models.SessionData; import models.person; import org.apache.thrift.TException; //import org.apache.thrift.protocol.TBinaryProtocol; @@ -185,7 +187,7 @@ public class Login_GUI extends JFrame { String passText = new String(pass.getPassword()); System.out.println(username.getText() + " " + passText); result = client.authenticate(username.getText(), passText); - + } catch (thrift.AuthenticationException e) { System.out.println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane.showMessageDialog(null, @@ -227,11 +229,12 @@ public class Login_GUI extends JFrame { setVisible(false); } else { UserInfo user = client.getUserFromToken(token); - + String hochschule = user.eMail.substring(user.eMail .indexOf("@") + 1, user.eMail.indexOf(".", user.eMail.indexOf("@"))); // System.out.println("hochschule="+hochschule); + person.verantwortlicher.setUsername(username.getText()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java index 9b10cb3c..11783d60 100644 --- a/Dozentenmodul/src/gui/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/MainMenue_GUI.java @@ -355,7 +355,7 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + "\"Programmieren\"."); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/gui/Image_zu_Veranstaltung_gr\u00FCn.png"))); + .getResource("/Image_zu_Veranstaltung_gr\u00FCn.png"))); // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); diff --git a/Dozentenmodul/src/gui/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/SearchEditImage_GUI.java index dbe23115..dbc2562c 100644 --- a/Dozentenmodul/src/gui/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/SearchEditImage_GUI.java @@ -25,6 +25,7 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; @@ -44,6 +45,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.person; //import models.person; import org.apache.thrift.TException; @@ -51,6 +53,7 @@ import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; + @SuppressWarnings("serial") public class SearchEditImage_GUI extends JFrame { @@ -269,14 +272,14 @@ public class SearchEditImage_GUI extends JFrame { System.out.println(tabbedPane.getSelectedIndex()); if(tabbedPane.getSelectedIndex()==0){ - - + String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname(); + //String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); } else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + + - //rowSorterMyImages.toggleSortOrder(0); } } @@ -284,17 +287,7 @@ public class SearchEditImage_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); JScrollPane scrollPaneAllImages = new JScrollPane(); tableAllImages=new JTable(); @@ -305,13 +298,23 @@ public class SearchEditImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages=new JTable(); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); tableAllImages.setRowSorter(rowSorterAll); scrollPaneAllImages.setViewportView(tableAllImages); tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); JScrollPane scrollPaneCoopImages = new JScrollPane(); JTable tableCoopImages=new JTable(); @@ -359,10 +362,27 @@ public class SearchEditImage_GUI extends JFrame { btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { //Öffnet den Downloader - con.closeThriftConnection(); - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - SearchEditImage_GUI.this.setVisible(false); + + if(tablemyImages.getSelectedRow()!=-1) + { + String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); + + Image.image.setImageId(imageid); + String imageversion=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 8).toString(); + + Image.image.setVersion(imageversion); + SearchEditImage_GUI.this.setVisible(false); + FTPDownloader_GUI down=new FTPDownloader_GUI(); + down.setVisible(true); + con.closeThriftConnection(); + + + + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); btnDownload.setBounds(449, 508, 118, 23); @@ -395,7 +415,7 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); //Image.image.setImageId(imageid); - + if(tabbedPane.getSelectedIndex()==0){ String imageid=modelMyImages.getValueAt(tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString(); Image.image.setImageId(imageid); @@ -405,7 +425,12 @@ public class SearchEditImage_GUI extends JFrame { con.closeThriftConnection(); EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); ea.setVisible(true); - dispose(); + dispose(); + } + else{ + JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein eigenes Image aus", "Message", + JOptionPane.INFORMATION_MESSAGE); + } } }); cancelButton.setActionCommand("Cancel"); diff --git a/Dozentenmodul/src/models/SessionData.java b/Dozentenmodul/src/models/SessionData.java new file mode 100644 index 00000000..3b91e1a2 --- /dev/null +++ b/Dozentenmodul/src/models/SessionData.java @@ -0,0 +1,28 @@ +package models; + +public class SessionData { + private String sessionID; + private String authToken; + private String serverAdress; + public static SessionData session =new SessionData(); + public String getSessionID() { + return sessionID; + } + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + public String getAuthToken() { + return authToken; + } + public void setAuthToken(String authToken) { + this.authToken = authToken; + } + public String getServerAdress() { + return serverAdress; + } + public void setServerAdress(String serverAdress) { + this.serverAdress = serverAdress; + } + + +} diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java deleted file mode 100644 index 34f9ffaa..00000000 --- a/Dozentenmodul/src/models/vm.java +++ /dev/null @@ -1,69 +0,0 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 54ae8fb1..c1800d22 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index dcf9e658..48553784 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 636d50e6..b8323939 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 52b62ee2..5cb5de5d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 47bcd119..63c6a21f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index b9cb1ea4..ddd3d393 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index 2e0afed7..7950930a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index cd52da88..78eb762b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 2c9e4c7e..21fe734c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 590c2bcd..d859e5eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index 7f8ae8c6..f640d332 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index ad0574c6..fd5b9f34 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 13538c1f..271671b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 635c53c0..7a20bd38 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index 3f738078..d71ce22c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class index 6290a004..856e294b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index ba289f63..3cd6ad96 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class index 3fbb8677..39d581c1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index edb1bcec..bd52eea0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class index 40306c0d..ba3bdbd2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index c732068a..da1f03e1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class index 45589df3..d55d3ada 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index b6a19652..ffaa56da 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class index 7088768e..5c3233af 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index aa7ecc5b..1847f9fc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class index dd89977c..0600e248 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 705a33c7..a8b40f25 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class index 89af670d..523a7cac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index 2471001a..41778940 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class index 693325cd..e6f24939 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index ae81f238..9ac0adfc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class index 61e06f52..8dbe83a5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index b2db8d99..6944248e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class index c2c2ca58..e3710c4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index 2d438884..b43c5d99 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class index f2b57fb7..85c70822 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index 60246d3e..aa0c2bb0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class index c495d813..84459dd2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index 08f594ca..beb8edc7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index 31a856b1..d2415e28 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index 2fed4f2f..6e968f98 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index 0fb66c0d..9a167a57 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index ce5024d6..03738f7d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index cda02dce..f20a6e31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index a53a5690..4670da03 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 4c817ea4..4db3ad31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index 0485efb4..3e6204bd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index 06122d58..a7bbdba0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index a39d1d63..c8b71d4b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index 69232dd9..6432b5c3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 6b95e144..30f714b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index b48d1db8..064806c5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index ba4b4c81..203f4dc5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index 974ce04a..49ac3bf2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index af38e742..85a22072 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index a190c32b..bd6b1acd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index 890e8213..5b8a4fd8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index 8d491ab8..7508d6ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index f48d16cd..75ff5688 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 40177d04..9c351438 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index d10aedf6..c3124a38 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 8c9f3d14..cd59b0f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index c3cfe04b..2f1e0ac9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 5af2dce3..9752e403 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 94eec707..1a9bac88 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index 4b3ca880..f8d11519 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 8cb3e809..bf902019 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 16a4aceb..1057b97e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index abae47eb..578ade0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 4b06ae93..28058f19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index d01fdf1c..814bcfa6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index bb5e97c4..f5511eb0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index 42042b94..1c09f788 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index f4fabf54..4d4fe750 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index 348ca927..af2aa623 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index 22764a7a..d8f6bbf0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 6a582eda..f00be9db 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index be92db51..3ace2f05 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index e3af306c..eeb6040c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 77822f8b..dbdae7d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index d290e233..086d09f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 087be9cb..cacf4480 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 165ca1fd..8abcae75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index 01f278f2..6939ee7f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index 078a92a2..3e5a664e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 1e27cb2b..fb65b77d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index cf9f1a46..4b018be0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index 910a07be..0795b7e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index e0c90c41..4c6efd43 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index ea0aac68..c6a6e919 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 1dc1acbe..fcd2a6e8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index b2b736b9..ff266614 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index 46040508..6a169867 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index 0261ca03..aa8c8782 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index 61f1504d..eb813265 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index 3968c27f..4e5db36b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index 87f255d2..8c209f6e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 6b0de404..b2aea627 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index 0fddf45d..245feb39 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index c33d93c8..bd467f21 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 5a78bea3..bd282c28 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 0a37b52c..41d42e5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index b32073e2..9aa46e2a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index c9602e72..c4c92fa2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index b094d83f..619c402c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index 4e0eac29..60297af0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index 37d2bfce..428fae5f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index d3a5e629..05f65927 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 677cf6e7..34bbc442 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index a0e50f65..f3420fe0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index de271782..a03c7f1c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index 2cff3f79..c261b461 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index caf4f5ab..0c0ed4c5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index 4bc03b1b..45b70561 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index d421488d..f47d4cbc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index 4eec1f61..865faf19 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 25714de2..c090fc0e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 9878f82f..a340c2d7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index 820047ed..9339c0ef 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index e2615b10..0da12764 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index a99172e0..f253f3a5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index a09507c2..5d53f238 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index a9efd658..23866029 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index c5d3070a..6dc7b5da 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index f84046fd..41a74b93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index a0e39f19..dc7273ba 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index 18f2f747..08ce25c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 23a1b04e..5333ed09 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 2bf508fe..6cbca529 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index 72c0e132..be51def7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index 465e526f..8d0a0924 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 99a1ca2c..8482847c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 3d83b674..5079da9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index cf401688..b54cfa9d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 20c33f69..a86952f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index d39b5eaa..4bcff3bb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index cd64d091..367e4623 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index a6a046a9..eee29d0f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index 5ca4e662..c13e4186 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index 22767aa5..fc535bbf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 8c3ee771..fc7ae567 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index ec794b93..b5a7bc52 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 7f78ba17..1e0320f7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index 80170c5f..89abe9ff 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index e36694de..1730bb78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index bafaca4a..730620cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index 0e90f432..479b2e8b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index fe9789e5..f696fbb9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 472541ab..fbf10c75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index 5784027a..25c867fd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index 1a12ac16..d4d78880 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index 3b6a1df1..83f69338 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index 11278b31..fcd686f3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index 2a2b9950..56520559 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index bbc8f5de..688721d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 0e463eef..08600baa 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index f6ac5397..5c6311ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index f8694799..d0eba733 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index 928375bd..d90eb444 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index 883e1b4c..63a16e25 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index 435037e1..80275e4d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index 63574fda..8ead4fa2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index 1503f186..df1529ae 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index a1aecc8d..4ea61056 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 8f15a17a..964d6b01 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index 09aeb14d..c1bec473 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index d6f97faf..7d8a670d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 12c2a78a..71b88e4a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index 2b2ce43d..086fee05 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index 631bfe6d..a832a1e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index 4fb7b29b..afcc0d29 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 57bf3c1c..6d3d00f4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 21152e10..00d9d1cb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index 7b995a7c..1d8e43a3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index bb71f7a1..362cb964 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index 4af3c48a..e258e397 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index df06ff1d..ea44acdd 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index de652ba4..5e2df842 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index f17f52a2..04efdd42 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index da9eda5a..2cc5730a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index adb3ed9f..ad694d39 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index ee51aabf..7b8d6740 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 36303474..a614b4ac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index 718cff17..a00d86cc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index adf5624f..ce6b1b4e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index 6e02ab65..8cfc248d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index 2190e109..e166b718 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 9dcbd40e..aeaa0c9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index eddcd8b6..ed7ec808 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index b0441555..d303e701 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index 9360cad9..9ceaa0f6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index 89beaed4..6e21638f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index 5e5afdca..aa46286f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 94197262..4e5309b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index b3416972..18c392c1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index ee35f096..0538e8bc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 0106166e..71694b8e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 8a73f7e2..cdd9ded1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index ed2fb7df..6ed4f413 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 4bb45a96..b9a7519e 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index c2a0c5c9..b3c6fccb 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 9994fcb4..558729d1 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -40,7 +40,7 @@ public class Server { public long DeleteFtpUser(String user) throws org.apache.thrift.TException; - public String getPathOfImage(String name) throws org.apache.thrift.TException; + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; public boolean writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; @@ -68,7 +68,7 @@ public class Server { public void DeleteFtpUser(String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -155,16 +155,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "DeleteFtpUser failed: unknown result"); } - public String getPathOfImage(String name) throws org.apache.thrift.TException + public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { - send_getPathOfImage(name); + send_getPathOfImage(image_id, version); return recv_getPathOfImage(); } - public void send_getPathOfImage(String name) throws org.apache.thrift.TException + public void send_getPathOfImage(String image_id, String version) throws org.apache.thrift.TException { getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); sendBase("getPathOfImage", args); } @@ -494,24 +495,27 @@ public class Server { } } - public void getPathOfImage(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - getPathOfImage_call method_call = new getPathOfImage_call(name, resultHandler, this, ___protocolFactory, ___transport); + getPathOfImage_call method_call = new getPathOfImage_call(image_id, version, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class getPathOfImage_call extends org.apache.thrift.async.TAsyncMethodCall { - private String name; - public getPathOfImage_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String image_id; + private String version; + public getPathOfImage_call(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.name = name; + this.image_id = image_id; + this.version = version; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getPathOfImage", org.apache.thrift.protocol.TMessageType.CALL, 0)); getPathOfImage_args args = new getPathOfImage_args(); - args.setName(name); + args.setImage_id(image_id); + args.setVersion(version); args.write(prot); prot.writeMessageEnd(); } @@ -988,7 +992,7 @@ public class Server { public getPathOfImage_result getResult(I iface, getPathOfImage_args args) throws org.apache.thrift.TException { getPathOfImage_result result = new getPathOfImage_result(); - result.success = iface.getPathOfImage(args.name); + result.success = iface.getPathOfImage(args.image_id, args.version); return result; } } @@ -1355,7 +1359,7 @@ public class Server { } public void start(I iface, getPathOfImage_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.getPathOfImage(args.name,resultHandler); + iface.getPathOfImage(args.image_id, args.version,resultHandler); } } @@ -3140,7 +3144,8 @@ public class Server { public static class getPathOfImage_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPathOfImage_args"); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField IMAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("image_id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-2); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -3148,11 +3153,13 @@ public class Server { schemes.put(TupleScheme.class, new getPathOfImage_argsTupleSchemeFactory()); } - public String name; // required + public String image_id; // required + public String version; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - NAME((short)-1, "name"); + IMAGE_ID((short)-1, "image_id"), + VERSION((short)-2, "version"); private static final Map byName = new HashMap(); @@ -3167,8 +3174,10 @@ public class Server { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // NAME - return NAME; + case -1: // IMAGE_ID + return IMAGE_ID; + case -2: // VERSION + return VERSION; default: return null; } @@ -3212,7 +3221,9 @@ public class Server { public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.IMAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("image_id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPathOfImage_args.class, metaDataMap); @@ -3222,18 +3233,23 @@ public class Server { } public getPathOfImage_args( - String name) + String image_id, + String version) { this(); - this.name = name; + this.image_id = image_id; + this.version = version; } /** * Performs a deep copy on other. */ public getPathOfImage_args(getPathOfImage_args other) { - if (other.isSetName()) { - this.name = other.name; + if (other.isSetImage_id()) { + this.image_id = other.image_id; + } + if (other.isSetVersion()) { + this.version = other.version; } } @@ -3243,40 +3259,73 @@ public class Server { @Override public void clear() { - this.name = null; + this.image_id = null; + this.version = null; } - public String getName() { - return this.name; + public String getImage_id() { + return this.image_id; } - public getPathOfImage_args setName(String name) { - this.name = name; + public getPathOfImage_args setImage_id(String image_id) { + this.image_id = image_id; return this; } - public void unsetName() { - this.name = null; + public void unsetImage_id() { + this.image_id = null; } - /** Returns true if field name is set (has been assigned a value) and false otherwise */ - public boolean isSetName() { - return this.name != null; + /** Returns true if field image_id is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_id() { + return this.image_id != null; } - public void setNameIsSet(boolean value) { + public void setImage_idIsSet(boolean value) { if (!value) { - this.name = null; + this.image_id = null; + } + } + + public String getVersion() { + return this.version; + } + + public getPathOfImage_args setVersion(String version) { + this.version = version; + return this; + } + + public void unsetVersion() { + this.version = null; + } + + /** Returns true if field version is set (has been assigned a value) and false otherwise */ + public boolean isSetVersion() { + return this.version != null; + } + + public void setVersionIsSet(boolean value) { + if (!value) { + this.version = null; } } public void setFieldValue(_Fields field, Object value) { switch (field) { - case NAME: + case IMAGE_ID: if (value == null) { - unsetName(); + unsetImage_id(); } else { - setName((String)value); + setImage_id((String)value); + } + break; + + case VERSION: + if (value == null) { + unsetVersion(); + } else { + setVersion((String)value); } break; @@ -3285,8 +3334,11 @@ public class Server { public Object getFieldValue(_Fields field) { switch (field) { - case NAME: - return getName(); + case IMAGE_ID: + return getImage_id(); + + case VERSION: + return getVersion(); } throw new IllegalStateException(); @@ -3299,8 +3351,10 @@ public class Server { } switch (field) { - case NAME: - return isSetName(); + case IMAGE_ID: + return isSetImage_id(); + case VERSION: + return isSetVersion(); } throw new IllegalStateException(); } @@ -3318,12 +3372,21 @@ public class Server { if (that == null) return false; - boolean this_present_name = true && this.isSetName(); - boolean that_present_name = true && that.isSetName(); - if (this_present_name || that_present_name) { - if (!(this_present_name && that_present_name)) + boolean this_present_image_id = true && this.isSetImage_id(); + boolean that_present_image_id = true && that.isSetImage_id(); + if (this_present_image_id || that_present_image_id) { + if (!(this_present_image_id && that_present_image_id)) return false; - if (!this.name.equals(that.name)) + if (!this.image_id.equals(that.image_id)) + return false; + } + + boolean this_present_version = true && this.isSetVersion(); + boolean that_present_version = true && that.isSetVersion(); + if (this_present_version || that_present_version) { + if (!(this_present_version && that_present_version)) + return false; + if (!this.version.equals(that.version)) return false; } @@ -3343,12 +3406,22 @@ public class Server { int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = Boolean.valueOf(isSetImage_id()).compareTo(other.isSetImage_id()); if (lastComparison != 0) { return lastComparison; } - if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); + if (isSetImage_id()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_id, other.image_id); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetVersion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); if (lastComparison != 0) { return lastComparison; } @@ -3373,11 +3446,19 @@ public class Server { StringBuilder sb = new StringBuilder("getPathOfImage_args("); boolean first = true; - sb.append("name:"); - if (this.name == null) { + sb.append("image_id:"); + if (this.image_id == null) { sb.append("null"); } else { - sb.append(this.name); + sb.append(this.image_id); + } + first = false; + if (!first) sb.append(", "); + sb.append("version:"); + if (this.version == null) { + sb.append("null"); + } else { + sb.append(this.version); } first = false; sb.append(")"); @@ -3423,10 +3504,18 @@ public class Server { break; } switch (schemeField.id) { - case -1: // NAME + case -1: // IMAGE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -2: // VERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3446,9 +3535,14 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.name != null) { - oprot.writeFieldBegin(NAME_FIELD_DESC); - oprot.writeString(struct.name); + if (struct.version != null) { + oprot.writeFieldBegin(VERSION_FIELD_DESC); + oprot.writeString(struct.version); + oprot.writeFieldEnd(); + } + if (struct.image_id != null) { + oprot.writeFieldBegin(IMAGE_ID_FIELD_DESC); + oprot.writeString(struct.image_id); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -3469,22 +3563,32 @@ public class Server { public void write(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetName()) { + if (struct.isSetImage_id()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); - if (struct.isSetName()) { - oprot.writeString(struct.name); + if (struct.isSetVersion()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetImage_id()) { + oprot.writeString(struct.image_id); + } + if (struct.isSetVersion()) { + oprot.writeString(struct.version); } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, getPathOfImage_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.name = iprot.readString(); - struct.setNameIsSet(true); + struct.image_id = iprot.readString(); + struct.setImage_idIsSet(true); + } + if (incoming.get(1)) { + struct.version = iprot.readString(); + struct.setVersionIsSet(true); } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index dccda971..26a1967b 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -68,10 +68,20 @@ public class ServerHandler implements Server.Iface { return ret; } - @Override - public String getPathOfImage(String name) throws TException { - // TODO Auto-generated method stub + public String getPathOfImage(String image_id, String version) throws TException { + + try { + ResultSet rs=sql.getPathOfImage(con, image_id, version); + System.out.println("Path SQL erfolgreich"); + rs.next(); + System.out.println(rs.getString("image_path")); + return rs.getString("image_path"); + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 7eca6952..a93f35b0 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -82,12 +82,12 @@ public class SQL { return null; } - public ResultSet getPathOfImage(Connection con, String image_name) + public ResultSet getPathOfImage(Connection con, String image_id, String version) { try { Statement stm=con.createStatement(); - return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where image_name like '"+image_name+"';"); + return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID='"+image_id+"' and imageVersion='"+version+"';"); } catch (SQLException e) { diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 4c9e51fa..7ed807fa 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -24,7 +24,7 @@ struct Image{ service Server{ User getFtpUser(), int DeleteFtpUser(string user), - string getPathOfImage(string name), + string getPathOfImage(string image_id,string version), bool writeVLdata(string imagename, string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), list getImageList(), list getAllOS(), -- cgit v1.2.3-55-g7522 From 367db7b0832e1325a0f1d0580baffa28deca86f4 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Apr 2014 11:55:21 +0200 Subject: test --- Dozentenmodul/bin/Models/Lecture.class | Bin 1644 -> 2035 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class | Bin 0 -> 686 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class | Bin 0 -> 1481 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class | Bin 0 -> 754 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class | Bin 0 -> 1502 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class | Bin 0 -> 763 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class | Bin 0 -> 805 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class | Bin 0 -> 2426 bytes Dozentenmodul/bin/gui/EditLinkImage_GUI.class | Bin 0 -> 11337 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$1.class | Bin 764 -> 764 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$2.class | Bin 841 -> 841 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$3.class | Bin 1874 -> 1874 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI$4.class | Bin 1976 -> 1874 bytes .../bin/gui/EditVeranstaltungAllgemein_GUI.class | Bin 9371 -> 9967 bytes .../bin/gui/SearchEditLecture_GUI$1.class | Bin 831 -> 831 bytes .../bin/gui/SearchEditLecture_GUI$2.class | Bin 1265 -> 1265 bytes .../bin/gui/SearchEditLecture_GUI$3.class | Bin 899 -> 899 bytes .../bin/gui/SearchEditLecture_GUI$4.class | Bin 908 -> 908 bytes .../bin/gui/SearchEditLecture_GUI$5.class | Bin 1743 -> 1743 bytes .../bin/gui/SearchEditLecture_GUI$6.class | Bin 1855 -> 950 bytes .../bin/gui/SearchEditLecture_GUI$7.class | Bin 950 -> 2992 bytes .../bin/gui/SearchEditLecture_GUI$8.class | Bin 1986 -> 0 bytes Dozentenmodul/bin/gui/SearchEditLecture_GUI.class | Bin 11517 -> 11376 bytes Dozentenmodul/bin/models/Lecture.class | Bin 1644 -> 2035 bytes Dozentenmodul/src/Models/Lecture.java | 19 + Dozentenmodul/src/gui/EditLinkImage_GUI.java | 436 +++++++++++++++++++++ .../src/gui/EditVeranstaltungAllgemein_GUI.java | 32 +- Dozentenmodul/src/gui/SearchEditLecture_GUI.java | 82 ++-- Dozentenmodul/src/models/Lecture.java | 19 + 29 files changed, 531 insertions(+), 57 deletions(-) create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/EditLinkImage_GUI.class delete mode 100644 Dozentenmodul/bin/gui/SearchEditLecture_GUI$8.class create mode 100644 Dozentenmodul/src/gui/EditLinkImage_GUI.java (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class index 6626b998..7c968cd1 100644 Binary files a/Dozentenmodul/bin/Models/Lecture.class and b/Dozentenmodul/bin/Models/Lecture.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class new file mode 100644 index 00000000..678491af Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class new file mode 100644 index 00000000..6384d363 Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class new file mode 100644 index 00000000..e94e0e13 Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class new file mode 100644 index 00000000..b952d8f3 Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class new file mode 100644 index 00000000..434f209e Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class new file mode 100644 index 00000000..a38e792e Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class new file mode 100644 index 00000000..07d40c7e Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/EditLinkImage_GUI.class b/Dozentenmodul/bin/gui/EditLinkImage_GUI.class new file mode 100644 index 00000000..218bfa86 Binary files /dev/null and b/Dozentenmodul/bin/gui/EditLinkImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class index 7cf31fef..43873477 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class index b4b44d0c..98d359ee 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class index ce4c4410..ac902be7 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class index b4468b87..b786208b 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class index c8267a99..1c9bf34c 100644 Binary files a/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class and b/Dozentenmodul/bin/gui/EditVeranstaltungAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class index e78c4d43..24e378be 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class index 98148b0d..1b56fca6 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class index 441eb2c3..b48d68c6 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class index 34e2329f..e37e9a30 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class index c2cd1958..d8cad4d1 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class index 7fc7e77f..fe6a0214 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class index 885be80b..64b0b1ae 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$8.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI$8.class deleted file mode 100644 index 882cfb27..00000000 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI$8.class and /dev/null differ diff --git a/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class b/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class index 317d2a79..ed3f1c5b 100644 Binary files a/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class and b/Dozentenmodul/bin/gui/SearchEditLecture_GUI.class differ diff --git a/Dozentenmodul/bin/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class index 6626b998..7c968cd1 100644 Binary files a/Dozentenmodul/bin/models/Lecture.class and b/Dozentenmodul/bin/models/Lecture.class differ diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 383bded9..069946b3 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -11,9 +11,28 @@ public class Lecture { private Date startdate; private Date enddate; private boolean active; + private String id; + private String linkedImagename; + public static Lecture lecture =new Lecture(); + + public String getLinkedImagename() { + return linkedImagename; + } + + public void setLinkedImagename(String linkedImagename) { + this.linkedImagename = linkedImagename; + } + + public String getid() { + return id; + } + + public void setid(String id) { + this.id = id; + } public String getName() { return name; } diff --git a/Dozentenmodul/src/gui/EditLinkImage_GUI.java b/Dozentenmodul/src/gui/EditLinkImage_GUI.java new file mode 100644 index 00000000..8de896c3 --- /dev/null +++ b/Dozentenmodul/src/gui/EditLinkImage_GUI.java @@ -0,0 +1,436 @@ +package gui; + + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.table.DefaultTableModel; + +import models.Lecture; +import models.person; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class EditLinkImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + private JTextField textFieldName; + String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; + ThriftConnection thrift=new ThriftConnection(); + Client client=thrift.getThriftConnection(); + + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + EditLinkImage_GUI dialog = new EditLinkImage_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public EditLinkImage_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite *Prototyp*"); + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 603) / 2; + int left=(screenSize.width - 722) / 2; + setBounds(left, top, 603, 722); + + + final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); + final DefaultTableModel model = new DefaultTableModel( titles, 0 ); + + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Veanstaltung verlinken"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 49, 557, 131); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + textFieldName = new JTextField(); + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + String stext=textFieldName.getText(); + modelAll.setRowCount(0); + initTableModel(modelAll); + + if(stext!="") + for(int i=0;iErweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + ExtendedSearch_GUI es=new ExtendedSearch_GUI(); + es.setVisible(true); + } + }); + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + comboBox = new JComboBox(); + try { + List list=client.getAllOS(); + comboBox.addItem(""); + for(int i=0;i"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("Veranstaltung"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 76, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(151, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Veranstaltung verlinken"); + lblNewLabel_1.setBounds(164, 11, 113, 14); + contentPanel.add(lblNewLabel_1); + + JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + JTable tablemyImages=new JTable(); + tablemyImages.setModel(model); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllImages=new JTable(); + tableAllImages.setModel(modelAll); + tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages=new JTable(); + tableCoopImages.setModel(model); + tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable tablePublicImages=new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + JTable tablePublicVorlagen=new JTable(); + tablePublicVorlagen.setModel(model); + tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + + JButton btnLinkLschen = new JButton("Link l\u00F6schen"); + btnLinkLschen.setBounds(478, 508, 89, 23); + contentPanel.add(btnLinkLschen); + + initTableModel(modelAll); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString(); + try { + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString()); + client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultät()); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu = new JMenu("Suchen"); + menuBar.add(mnNewMenu); + + JMenuItem mntmVlSuche = new JMenuItem("VL Suche"); + mnNewMenu.add(mntmVlSuche); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + } + + public DefaultTableModel initTableModel(DefaultTableModel model){ + List images; + try { + images = client.getImageList(); + Iterator i=images.iterator(); + List ListObj = new ArrayList(); + int x=0; + + while(i.hasNext()) + { + + i.next(); + Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()}; + ListObj.add(obj); + model.addRow(ListObj.get(x)); + x++; + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + } + + diff --git a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java index 57980a9b..e4f1ca67 100644 --- a/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/EditVeranstaltungAllgemein_GUI.java @@ -21,7 +21,6 @@ import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.JTextField; @@ -38,6 +37,7 @@ import javax.swing.JTextArea; import java.awt.ScrollPane; import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; +import javax.swing.ButtonGroup; @SuppressWarnings("serial") @@ -54,7 +54,8 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { JRadioButton radioButtonyes; JDateChooser dateChooserend; JDateChooser dateChooserstart; - + JRadioButton radioButtonno; + private final ButtonGroup buttonGroup = new ButtonGroup(); /** * Launch the application. */ @@ -233,6 +234,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { panel_2.add(label_3); textFieldLaborname = new JTextField(); + textFieldLaborname.setText(Lecture.lecture.getName()); textFieldLaborname.setColumns(10); textFieldLaborname.setBounds(200, 22, 347, 20); panel_2.add(textFieldLaborname); @@ -246,7 +248,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { textArea.setBounds(10, 49, 537, 49); panel_2.add(textArea); - JLabel label_4 = new JLabel("Kurzbeschreibung: *"); + JLabel label_4 = new JLabel("Beschreibung: *"); label_4.setBounds(10, 111, 180, 14); panel_2.add(label_4); @@ -254,13 +256,15 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { scrollPane.setBounds(200, 104, 347, 78); panel_2.add(scrollPane); description = new JTextArea(); + description.setText(Lecture.lecture.getDesc()); description.setLineWrap(true); scrollPane.add(description); description.setBounds(0, 0, 4, 22); scrollPane.add(description); dateChooserend = new JDateChooser(); - dateChooserend.setDateFormatString("dd.MM.yyyy hh:mm:ss"); + dateChooserend.setDateFormatString("dd-MM-yyyy hh:mm:ss"); + dateChooserend.setDate(Lecture.lecture.getEnddate()); dateChooserend.setBounds(385, 188, 100, 20); panel_2.add(dateChooserend); @@ -270,6 +274,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { dateChooserstart = new JDateChooser(); dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss"); + dateChooserstart.setDate(Lecture.lecture.getStartdate()); dateChooserstart.setBounds(240, 188, 101, 20); panel_2.add(dateChooserstart); @@ -286,11 +291,20 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { panel_2.add(label_11); radioButtonyes = new JRadioButton("Ja"); - radioButtonyes.setSelected(true); + buttonGroup.add(radioButtonyes); + if(Lecture.lecture.isActive()==true) + { + radioButtonyes.setSelected(true); + }else + { + radioButtonno.setSelected(true); + } + radioButtonyes.setBounds(240, 225, 109, 23); panel_2.add(radioButtonyes); - JRadioButton radioButtonno = new JRadioButton("Nein"); + radioButtonno = new JRadioButton("Nein"); + buttonGroup.add(radioButtonno); radioButtonno.setBounds(385, 225, 109, 23); panel_2.add(radioButtonno); @@ -350,9 +364,7 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { Lecture.lecture.setStartdate(dateChooserstart.getDate()); Image.image.setImagename(textFieldLaborname.getText()); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); - dispose(); + LinkImage_GUI ev=new LinkImage_GUI(); ev.setVisible(true); dispose(); @@ -394,4 +406,6 @@ public class EditVeranstaltungAllgemein_GUI extends JFrame { mnNewMenu_1.add(mntmOtrs); } + + } diff --git a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java b/Dozentenmodul/src/gui/SearchEditLecture_GUI.java index f0e360cd..9553bc6e 100644 --- a/Dozentenmodul/src/gui/SearchEditLecture_GUI.java +++ b/Dozentenmodul/src/gui/SearchEditLecture_GUI.java @@ -15,10 +15,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; @@ -44,7 +46,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; -import models.Image; + +import models.Lecture; import models.person; //import models.person; @@ -202,7 +205,7 @@ public class SearchEditLecture_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauütmenü + //Öffnet das Hauptmenü con.closeThriftConnection(); SearchEditLecture_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); @@ -237,7 +240,6 @@ public class SearchEditLecture_GUI extends JFrame { if(tabbedPane.getSelectedIndex()==0){ String username= person.verantwortlicher.getName()+" "+person.verantwortlicher.getVorname(); - //String username="Spitzer Tobias"; rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(username, 5)); } else if(tabbedPane.getSelectedIndex()==1){ @@ -249,8 +251,9 @@ public class SearchEditLecture_GUI extends JFrame { } }); - tabbedPane.setBounds(10, 197, 557, 300); + tabbedPane.setBounds(10, 197, 557, 323); contentPanel.add(tabbedPane); + System.out.println("haaaaaaaaaaa"); initTableModel(modelMyLectures); JScrollPane scrollPaneAllImages = new JScrollPane(); @@ -319,39 +322,6 @@ public class SearchEditLecture_GUI extends JFrame { scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); tabbedPane.setEnabledAt(4, false); - - - - - JButton btnDownload = new JButton("Download"); - btnDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - - if(tablemyLectures.getSelectedRow()!=-1) - { - String imageid=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 7).toString(); - - Image.image.setImageId(imageid); - String imageversion=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); - - Image.image.setVersion(imageversion); - SearchEditLecture_GUI.this.setVisible(false); - FTPDownloader_GUI down=new FTPDownloader_GUI(); - down.setVisible(true); - con.closeThriftConnection(); - - - - } - else{ - JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image für den Download aus", "Message", - JOptionPane.INFORMATION_MESSAGE); - } - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); @@ -377,16 +347,36 @@ public class SearchEditLecture_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + //Image.image.setImageId(imageid); if(tabbedPane.getSelectedIndex()==0){ - String imageid=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 7).toString(); + + + Lecture.lecture.setid(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString()); + Lecture.lecture.setName(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 0).toString()); + Lecture.lecture.setDesc(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 1).toString()); + String date=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 2).toString(); + Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 6).toString()); + String startdate=date.substring(0,date.indexOf(" ")); + String enddate=date.substring(date.indexOf(" ")); + DateFormat df=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - Image.image.setImageId(imageid); - String imageversion=modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); + try { + Lecture.lecture.setEnddate(df.parse(enddate)); + Lecture.lecture.setStartdate(df.parse(startdate)); + } catch (ParseException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + if(modelMyLectures.getValueAt(tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 3).toString().equals("1")){ + Lecture.lecture.setActive(true); + } + else + { + Lecture.lecture.setActive(false); + } - Image.image.setVersion(imageversion); con.closeThriftConnection(); EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); ea.setVisible(true); @@ -430,7 +420,6 @@ public class SearchEditLecture_GUI extends JFrame { try { //Hole eine Liste der Images lectures = client.getLectureList(); - Iterator i=lectures.iterator(); int x=0; @@ -438,10 +427,7 @@ public class SearchEditLecture_GUI extends JFrame { while(i.hasNext()) { //erzeuge Objekte für die Tabelle - System.out.println(lectures.get(x).lecturename); - Object [] obj={lectures.get(x).lecturename,lectures.get(x).desc,lectures.get(x).starttime+" "+lectures.get(x).endtime,lectures.get(x).isActive,lectures.get(x).lastused,lectures.get(x).username,lectures.get(x).imagename,lectures.get(x).id}; - //String[] titles= {"Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv","Letzte Benutzung" ,"Verantwortlicher", "Image", "Schlagwort","ID"}; - //System.out.println("id:"+images.get(x).getId()); + Object [] obj={lectures.get(x).lecturename,lectures.get(x).desc,lectures.get(x).starttime+" "+lectures.get(x).endtime,lectures.get(x).isActive,lectures.get(x).lastused,lectures.get(x).username," ",lectures.get(x).imagename,lectures.get(x).id}; //Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 383bded9..069946b3 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -11,9 +11,28 @@ public class Lecture { private Date startdate; private Date enddate; private boolean active; + private String id; + private String linkedImagename; + public static Lecture lecture =new Lecture(); + + public String getLinkedImagename() { + return linkedImagename; + } + + public void setLinkedImagename(String linkedImagename) { + this.linkedImagename = linkedImagename; + } + + public String getid() { + return id; + } + + public void setid(String id) { + this.id = id; + } public String getName() { return name; } -- cgit v1.2.3-55-g7522 From 0fbe8c2ce5354de8a2725003e9d259a7d722c184 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 13:13:21 +0200 Subject: Update der Datenbank beim Update der Veranstaltung funktioniert nun --- Dozentenmodul/bin/Models/Lecture.class | Bin 2035 -> 2226 bytes .../bin/gui/image/FTPCreateUploader_GUI$1.class | Bin 792 -> 792 bytes .../bin/gui/image/FTPCreateUploader_GUI$2.class | Bin 1313 -> 1313 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$5.class | Bin 813 -> 813 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 1707 -> 1707 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 1652 -> 1652 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1014 -> 1014 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12313 -> 12312 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1414 -> 1414 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 1303 -> 1303 bytes .../bin/gui/image/FTPDownloader_GUI$3.class | Bin 1167 -> 1167 bytes .../bin/gui/image/FTPDownloader_GUI$4.class | Bin 785 -> 785 bytes .../bin/gui/image/FTPDownloader_GUI$5.class | Bin 1557 -> 1557 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 972 -> 972 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 9974 -> 9974 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 1503 -> 1503 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 11869 -> 11868 bytes .../gui/lecture/EditLectureAllgemein_GUI$4.class | Bin 1912 -> 1951 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 9977 -> 9977 bytes Dozentenmodul/bin/models/Lecture.class | Bin 2035 -> 2226 bytes Dozentenmodul/src/Models/Lecture.java | 9 ++++ .../src/gui/image/FTPCreateUploader_GUI.java | 4 +- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 4 +- .../src/gui/image/FTPEditUploader_GUI.java | 4 +- .../src/gui/lecture/CreateLectureLink_GUI.java | 5 +- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 3 +- .../src/gui/lecture/EditLectureLink_GUI.java | 29 ++++++----- Dozentenmodul/src/models/Lecture.java | 9 ++++ Dozentenmodulserver/bin/server/ServerHandler.class | Bin 11027 -> 11415 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 14453 -> 14580 bytes Dozentenmodulserver/src/server/ServerHandler.java | 16 ++++++- Dozentenmodulserver/src/sql/SQL.java | 53 ++++++++------------- 39 files changed, 83 insertions(+), 53 deletions(-) (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class index 7c968cd1..a0cb753d 100644 Binary files a/Dozentenmodul/bin/Models/Lecture.class and b/Dozentenmodul/bin/Models/Lecture.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class index 8a14b449..3eded544 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class index 8a5194f2..aac75f6d 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index a788e377..4adde720 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 8dcb0f90..03aeea73 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class index 70962f9c..7ffa5033 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index c02959c2..720ce3cd 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 f5009ce3..496f2158 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 e3beaa57..29269bbd 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 cec2cfad..bf24ef25 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 28596b7f..3be2f5f1 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 8b17dab5..217b987a 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 0b03bc49..0b7106e2 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 75c93b92..9b5b4107 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 0c97260a..847b6416 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 842bbb87..cb5888ae 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 0f9f8a09..97b76e5c 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 5df62ad7..a25d7157 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 4a933e6e..55d72ee9 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 b790203f..23f71ee1 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 44bbface..dfb69143 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 cadf961a..87c0067c 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 cd7f2b25..8d99419a 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 5a6ea8fa..71d93a4a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class index 57e66269..c412ac7b 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 05c6ac16..83d7cf3e 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/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class index 7c968cd1..a0cb753d 100644 Binary files a/Dozentenmodul/bin/models/Lecture.class and b/Dozentenmodul/bin/models/Lecture.class differ diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 069946b3..6b7e6fa1 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -6,6 +6,7 @@ public class Lecture { private String name; + private String newName; private String shortDesc; private String desc; private Date startdate; @@ -18,6 +19,14 @@ public class Lecture { public static Lecture lecture =new Lecture(); + public String getNewName() { + return newName; + } + + public void setNewName(String newName) { + this.newName = newName; + } + public String getLinkedImagename() { return linkedImagename; } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 1bf8cc3a..cd952d0f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -50,8 +50,8 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index d0f789f4..2ace42c6 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -45,8 +45,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; String downloadFile = ""; static String arg = ""; diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index b184c96c..a23e85d2 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -49,8 +49,8 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = "141.79.128.121"; + //String host = "141.79.128.102"; int port = 21; server.User user; String filename = ""; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index a9125829..2243fd43 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -476,8 +476,9 @@ public class CreateLectureLink_GUI extends JFrame { images.get(x).getLicenseRestriction(), images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; + images.get(x).getUserData(), + images.get(x).getUpdateTime() + }; ListObj.add(obj); model.addRow(ListObj.get(x)); x++; diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 40b3ce84..115a9f1f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -361,13 +361,14 @@ public class EditLectureAllgemein_GUI extends JFrame { } Lecture.lecture.setName(textFieldLaborname.getText()); + Lecture.lecture.setNewName(textFieldLaborname.getText()); Lecture.lecture.setDesc(description.getText()); Lecture.lecture.setEnddate(dateChooserend.getDate()); Lecture.lecture.setStartdate(dateChooserstart.getDate()); Image.image.setImagename(textFieldLaborname.getText()); - CreateLectureLink_GUI ev=new CreateLectureLink_GUI(); + EditLectureLink_GUI ev=new EditLectureLink_GUI(); ev.setVisible(true); dispose(); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index c245ce79..c1fdec80 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -63,7 +63,7 @@ public class EditLectureLink_GUI extends JFrame { JTable tablePublicVorlagen = new JTable(); private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "Schlagwort" }; + "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection thrift = new ThriftConnection(); Client client = thrift.getThriftConnection(); @@ -355,7 +355,7 @@ public class EditLectureLink_GUI extends JFrame { } { JButton cancelButton = new JButton( - "Veranstaltung erzeugen und abschlie\u00DFen"); + "Veranstaltung ändern und abschlie\u00DFen"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -370,14 +370,16 @@ public class EditLectureLink_GUI extends JFrame { String imagename = tableAllImages.getValueAt( tableAllImages.getSelectedRow(), 0) .toString(); + System.out.println("ID: "+Lecture.lecture.getid()); + try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - System.out.println(formatter.format( - Lecture.lecture.getStartdate()) + + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + System.out.println( formatter.format( + Lecture.lecture.getEnddate()) .toString()); - client.writeLecturedata( - Lecture.lecture.getName(), + client.updateLecturedata(Lecture.lecture.getName(), + Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format( @@ -393,7 +395,9 @@ public class EditLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); + person.verantwortlicher.getFakultät(), + Lecture.lecture.getid()); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -407,6 +411,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } + MainMenue_GUI m = new MainMenue_GUI(); + m.setVisible(true); dispose(); } @@ -459,8 +465,9 @@ public class EditLectureLink_GUI extends JFrame { images.get(x).getLicenseRestriction(), images.get(x).getOsName(), images.get(x).getLectureName(), - images.get(x).getUpdateTime(), - images.get(x).getUserData() }; + images.get(x).getUserData(), + images.get(x).getUpdateTime(), "", images.get(x).id, + images.get(x).getVersion() }; ListObj.add(obj); model.addRow(ListObj.get(x)); x++; diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 069946b3..6b7e6fa1 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -6,6 +6,7 @@ public class Lecture { private String name; + private String newName; private String shortDesc; private String desc; private Date startdate; @@ -18,6 +19,14 @@ public class Lecture { public static Lecture lecture =new Lecture(); + public String getNewName() { + return newName; + } + + public void setNewName(String newName) { + this.newName = newName; + } + public String getLinkedImagename() { return linkedImagename; } diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index d14b9ee1..76357894 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 ea2ae3c3..6a4524b7 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index c7ab500b..9474d942 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -311,7 +311,21 @@ public class ServerHandler implements Server.Iface { boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws TException { - // TODO Auto-generated method stub + int pk_image=0; + int imageversion=0; + ResultSet image=sql.getImageIDandVersion(con, imagename); + + try { + while(image.next()) + { + pk_image=image.getInt("GUID_imageID"); + imageversion=image.getInt("imageVersion"); + } + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id); return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index ec1ea11f..27bdc17c 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -6,6 +6,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; @@ -447,8 +448,8 @@ public class SQL { return -1; } - public int updateLectureData(Connection con, int pk_person, int pk_image, - int imageversion, String name, String desc, String shortdesc, + public int updateLectureData(Connection con, int pk_image, + int imageversion, String name, String newName ,String desc, String shortdesc, String start, String end, boolean isactive, String id) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -459,36 +460,24 @@ public class SQL { } try { Statement stm = con.createStatement(); - Random random = new Random(); - int uid = random.nextInt(); - 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 - + "','" - + name - + "','" - + active_bol - + "','" - + start - + "','" - + end - + "','" - + formatter.format(new Date()) - + "','" - + shortdesc - + "','" - + desc - + "','" - + pk_image - + "','" - + imageversion - + "','" - + formatter.format(new Date()) - + "','" - + formatter.format(new Date()) - + "','" - + pk_person - + "','" - + pk_person + "');"); + stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '" + +newName + +"',`isActive` = '" + +active_bol + +"',`startTime` = '" + +start + +"',`endTime` = '" + +end + +"',`description` = '" + +desc + +"',`imageID` = '" + +pk_image + +"',`imageVersion` = '" + +imageversion + +"',`admin_changeTime` = '" + +formatter.format(new Date()) + +"'WHERE `lectureID` = '" + +id+"';" ); con.commit(); } catch (SQLException e) { -- cgit v1.2.3-55-g7522