diff options
| author | Nino Breuer | 2014-05-22 15:41:51 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-05-22 15:41:51 +0200 |
| commit | 8ee0ed5c5a947ecff257f799dfa60b9b000aab75 (patch) | |
| tree | e5790134d1cada9aee15611f8818fa7da71cd982 | |
| parent | Vorbereitung Multithreading (diff) | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.gz tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.tar.xz tutor-module-8ee0ed5c5a947ecff257f799dfa60b9b000aab75.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/intro/Login_GUI.class
Dozentenmodulserver/bin/server/ServerHandler.class
Dozentenmodulserver/bin/server/startServer.class
Dozentenmodulserver/src/server/startServer.java
357 files changed, 2815 insertions, 940 deletions
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class Binary files differindex 4c70ef81..59b34fab 100644 --- a/Dozentenmodul/bin/Models/Image.class +++ b/Dozentenmodul/bin/Models/Image.class diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differindex 32519c65..36fa9761 100644 --- a/Dozentenmodul/bin/Models/person.class +++ b/Dozentenmodul/bin/Models/person.class diff --git a/Dozentenmodul/bin/ftp/FTPUtility.class b/Dozentenmodul/bin/ftp/FTPUtility.class Binary files differindex 8484d422..95655233 100644 --- a/Dozentenmodul/bin/ftp/FTPUtility.class +++ b/Dozentenmodul/bin/ftp/FTPUtility.class diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class Binary files differindex 32bd6720..101ff93b 100644 --- a/Dozentenmodul/bin/ftp/UploadTask.class +++ b/Dozentenmodul/bin/ftp/UploadTask.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class Binary files differindex d5e68cc7..b6db4a44 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class Binary files differindex 35392672..192b81a6 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class Binary files differindex de93b267..b75c16b3 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class Binary files differindex be1e5801..c68ae652 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class Binary files differindex 0e5865b9..6460158f 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class Binary files differindex 04edeee9..1d67fe3e 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class Binary files differindex a88a21f5..9fc35b48 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class Binary files differindex 1ac1680a..4aedd907 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class Binary files differindex ac331f22..2c9cd712 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class Binary files differindex 6fa84ba9..82d24993 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Binary files differindex e429fcd8..4ca2208c 100644 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class Binary files differindex 7692bcfb..960d3ed5 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class Binary files differindex d11a8449..502e9387 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class Binary files differindex e28ed09a..cea4adc4 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class Binary files differdeleted file mode 100644 index 64a79922..00000000 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class Binary files differindex 071850c3..33f96306 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class Binary files differindex 216e48c4..ba4c1b16 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class Binary files differindex d22c246d..9ec941b5 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class Binary files differindex 4edb101c..20b74c24 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class Binary files differindex b31208f2..77c79351 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class Binary files differindex 7b09a9c7..7253db83 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class Binary files differindex 34ef1b8c..353bafa4 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class Binary files differindex 20f615b4..23d60d2f 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class Binary files differindex e0fabcc6..03680a6f 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class Binary files differindex 0d982996..21e46d35 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class Binary files differindex 65c67d65..214beaa8 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class Binary files differindex 79c3a835..cc06860f 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex 735ff875..e6bf572b 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class Binary files differindex 1b6ed7d5..6267c626 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class Binary files differindex 57505d9b..bc570ca9 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class Binary files differindex 53ce9bf1..2aab4d53 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class Binary files differindex d72b7fd9..765b22bf 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class Binary files differindex a86cfda4..dbc4fc9f 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class Binary files differindex 4ef7cd96..2153646f 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Binary files differindex d9f847f2..45ca0eae 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class Binary files differdeleted file mode 100644 index a25d7157..00000000 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class Binary files differdeleted file mode 100644 index 55d72ee9..00000000 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class Binary files differindex 23f71ee1..04c8b107 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class Binary files differdeleted file mode 100644 index dfb69143..00000000 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class Binary files differindex 87c0067c..a846427a 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class Binary files differdeleted file mode 100644 index 563e41cb..00000000 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex bd2d50f5..bde5917c 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class Binary files differindex 89997bb5..704987c5 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class Binary files differindex 87bf6d5f..16663b1c 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class Binary files differindex 35e33e48..854ba9e1 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class Binary files differindex d058454e..d0b7743e 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Binary files differindex 5713f420..e86ccb8f 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class Binary files differindex a0172be7..74425fa4 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class Binary files differindex ab7702e4..c9eec04e 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class Binary files differindex c868afe6..07430748 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class Binary files differindex 92fcc494..8c0f7192 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class Binary files differindex f8d904d8..af115764 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class Binary files differindex 5e1dc507..fc4f734d 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class Binary files differindex 46fdf45d..730cfbe9 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class Binary files differindex 1e1dc0f3..120af287 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class Binary files differindex 39a39cf6..f5971a3c 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class Binary files differindex 70661228..7e083945 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class Binary files differindex a69337f6..34ba71c8 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class Binary files differindex 0d4bafa7..6608b6fa 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class Binary files differindex 84ebd55c..a7494fc1 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class Binary files differindex 64948d28..3f9d2221 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class Binary files differindex 6db87dc2..8d8f8918 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 616eb572..91b73e2a 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class Binary files differindex 2891e710..4e2296e7 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class Binary files differindex bd12ec95..569827ad 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class Binary files differindex c964162e..e827afb1 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class Binary files differindex f2dd265c..31a514d3 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class Binary files differindex 3ba22ff0..852d5e14 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class Binary files differindex c867b9d2..34afa967 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class Binary files differindex e4239a4e..045661b3 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class Binary files differindex fa189dbb..8da2716a 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class Binary files differindex 843f828c..d411f9ab 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class Binary files differindex a373ce86..5b26c8f5 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class Binary files differindex c035deed..3b5e5f77 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class Binary files differindex 39963963..e1f554c7 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class Binary files differdeleted file mode 100644 index 3f17b0d6..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class Binary files differdeleted file mode 100644 index c9b6e28a..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class Binary files differdeleted file mode 100644 index 3485b280..00000000 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class Binary files differindex 2cd12110..dbfc1944 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class Binary files differindex 9b994ec4..12d4c61f 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class Binary files differindex 6862545b..51b3d910 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class Binary files differindex d71d71d5..ceea662a 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class Binary files differindex 9fe72770..67922a25 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class Binary files differindex 09017e11..11cda571 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class Binary files differindex adcc7fd5..0759ddca 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class Binary files differindex 58677633..8f480656 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class Binary files differindex dd70f264..0c7b67a0 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class Binary files differindex 22209c73..09461d3a 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class Binary files differindex 808b6d99..59b84bd3 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class Binary files differindex c412ac7b..ddd0274d 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class Binary files differindex 81bbec82..e8fd3516 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class Binary files differindex 8ae5f63c..c0f8c1c4 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class Binary files differindex 79f4356c..68c602c3 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class Binary files differindex b6c8be8f..a84d1ea3 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class Binary files differindex 14d5f97e..3eeb8494 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class Binary files differindex 4c70ef81..59b34fab 100644 --- a/Dozentenmodul/bin/models/Image.class +++ b/Dozentenmodul/bin/models/Image.class diff --git a/Dozentenmodul/bin/models/SessionData.class b/Dozentenmodul/bin/models/SessionData.class Binary files differindex f0ff4996..0718956c 100644 --- a/Dozentenmodul/bin/models/SessionData.class +++ b/Dozentenmodul/bin/models/SessionData.class diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class Binary files differindex 32519c65..36fa9761 100644 --- a/Dozentenmodul/bin/models/person.class +++ b/Dozentenmodul/bin/models/person.class diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class Binary files differindex 5b666704..8229138f 100644 --- a/Dozentenmodul/bin/thrift/MasterThriftConnection.class +++ b/Dozentenmodul/bin/thrift/MasterThriftConnection.class diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class Binary files differindex 40003a69..290acaad 100644 --- a/Dozentenmodul/bin/thrift/ThriftConnection.class +++ b/Dozentenmodul/bin/thrift/ThriftConnection.class diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index cdc8264c..0b3c936e 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -6,13 +6,22 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; private int cpu; + private long filesize; public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } @@ -61,4 +70,11 @@ public class Image { public void setVersion(String version) { this.version = version; } + public long getFilesize() { + return filesize; + } + public void setFilesize(long filesize) { + this.filesize = filesize; + } + } diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index 435f3c1d..67b6b84e 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -11,15 +11,10 @@ public class person{ private String Hochschule; private String EMail; private String Tel; - private String Fakultät; + private String Fakultaet; private boolean ischecked; - - - - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); - + //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); @@ -60,11 +55,11 @@ public class person{ public void setTel(String tel) { Tel = tel; } - public String getFakultät() { - return Fakultät; + public String getFakultaet() { + return Fakultaet; } - public void setFakultät(String fakultät) { - Fakultät = fakultät; + public void setFakultaet(String fakultaet) { + Fakultaet = fakultaet; } public boolean isIschecked() { return ischecked; diff --git a/Dozentenmodul/src/config/config_file.java b/Dozentenmodul/src/config/config_file.java index de8f1483..5d59e22a 100644 --- a/Dozentenmodul/src/config/config_file.java +++ b/Dozentenmodul/src/config/config_file.java @@ -10,14 +10,14 @@ public class config_file { String config_file="C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite"; - //File für den Ordner erzeugen + //File fuer den Ordner erzeugen File config=new File(config_file); String file=config_file+"\\config.ini"; //ini File erzeugen File conf=new File(file); Wini ini; - //Prüfen ob Ordner schon existiert + //Pruefen ob Ordner schon existiert if(config.exists()==false) { //Wenn nicht erzeuge Ordner @@ -41,7 +41,7 @@ public class config_file { } else { - //Wenn Ordner schon existiert, prüfe ob Datei existiert + //Wenn Ordner schon existiert, pruefe ob Datei existiert if(conf.exists()==false) { //Wenn nicht, erzeuge diese diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java index b4543349..f2c51dfc 100644 --- a/Dozentenmodul/src/ftp/FTPUtility.java +++ b/Dozentenmodul/src/ftp/FTPUtility.java @@ -196,44 +196,6 @@ public class FTPUtility { return outputStream; } - public String[] getAllRohling(String SearchString) throws SocketException - { - //FTPClient ftp=new FTPClient(); - - String[] filenamelist; - - - try { - - - ftpClient.changeWorkingDirectory("/home/openslx/images"); - filenamelist=ftpClient.listNames(); - - String[] search=new String[filenamelist.length]; - for(int i=0;i<filenamelist.length;i++) - { - /*if(filenamelist[i].startsWith(SearchString)==true) - { - search[i]=filenamelist[i]; - }*/ - - if(filenamelist[i].contains(SearchString)==true) - { - search[i]=filenamelist[i]; - } - } - return search; - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - - - - return null; - } + }
\ No newline at end of file diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 788acad6..06d76dc8 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -5,6 +5,8 @@ import java.io.FileInputStream; import javax.swing.JOptionPane; import javax.swing.SwingWorker; + +import models.Image; /** * Executes the file upload in a background thread and updates progress to @@ -47,14 +49,16 @@ public class UploadTask extends SwingWorker<Void, Void> { FileInputStream inputStream = new FileInputStream(uploadFile); byte[] buffer = new byte[BUFFER_SIZE]; int bytesRead = -1; + int i=0; long totalBytesRead = 0; int percentCompleted = 0; long fileSize = uploadFile.length(); + Image.image.setFilesize(fileSize); long start=System.nanoTime(); final double NANOS_PER_SECOND = 1000000000.0; final double BYTES_PER_MIB = 1024*1024; while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) { - util.writeFileBytes(buffer, 0, bytesRead); + util.writeFileBytes(buffer, 0, bytesRead); totalBytesRead += bytesRead; percentCompleted = (int) (totalBytesRead * 100 / fileSize); double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1); diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index f3b4d732..e6623c46 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -32,10 +32,12 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import models.Image; +import models.Links; import models.person; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -63,7 +65,7 @@ public class CreateImageAllgemein_GUI extends JFrame { imagename.requestFocusInWindow(); } }); - //Verhindert das Vergrößern des Fensters + //Verhindert das Vergroessern des Fensters setResizable(false); try { @@ -186,7 +188,7 @@ public class CreateImageAllgemein_GUI extends JFrame { imagename.setText((String) null); imagename.setColumns(10); imagename.setBounds(145, 31, 350, 20); - imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurück kommt zur Seite + imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurueck kommt zur Seite panel_1.add(imagename); JTextArea txtrGebenSieBitte = new JTextArea(); @@ -213,7 +215,7 @@ public class CreateImageAllgemein_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauptmenü + //oeffnet das Hauptmenue CreateImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -262,7 +264,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JButton continueButton = new JButton("Weiter"); continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Prüft die Eingabe + //Prueft die Eingabe if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) { //Schreibt die Daten in das Model @@ -273,7 +275,7 @@ public class CreateImageAllgemein_GUI extends JFrame { } else{ JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Daten unvollständig", JOptionPane.INFORMATION_MESSAGE); + "Daten unvollst\u00e4ndig", JOptionPane.INFORMATION_MESSAGE); } } }); @@ -298,9 +300,42 @@ public class CreateImageAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); }//end main diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index cf71082c..308ff3b7 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -30,12 +30,15 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; + import javax.swing.JRadioButton; import javax.swing.ButtonGroup; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; import models.Image; +import models.Links; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { @@ -169,7 +172,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBorder(new TitledBorder(null, "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(11, 196, 557, 338); contentPanel.add(panel_2); @@ -357,9 +360,43 @@ public class CreateImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 66dfc344..72ee98fa 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -3,6 +3,7 @@ package gui.image; import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -17,6 +18,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -46,6 +50,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; @@ -67,10 +73,18 @@ public class DeleteImage_GUI extends JFrame { JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + ThriftConnection con=new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles,0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( @@ -101,9 +115,9 @@ public class DeleteImage_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); - + try { // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -193,29 +207,33 @@ public class DeleteImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche*Folgt noch...*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + + // oeffnet das Fenster Extended GUI con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(332, 106, 188, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verf\u00FCgbaren Betriebssysteme vom Server List<String> list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -225,12 +243,12 @@ public class DeleteImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -246,8 +264,12 @@ public class DeleteImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + + // oeffnet das Hauuetmenue con.closeThriftConnection(); + + // oeffnet das Hauuetmenue + DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -310,7 +332,10 @@ public class DeleteImage_GUI extends JFrame { JScrollPane scrollPaneMyImage = new JScrollPane(); tablemyImages = new JTable(); tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + tablemyImages.setEnabled(true); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); @@ -381,9 +406,9 @@ public class DeleteImage_GUI extends JFrame { if (tablemyImages.getSelectedRowCount() != 0) { - // frage, soll das selektierte Daten gelöscht werden? + // frage, soll das selektierte Daten geloescht werden? eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?", + "Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?", JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { @@ -401,7 +426,7 @@ public class DeleteImage_GUI extends JFrame { .toString(); // TODO - // Image darf nur gelöscht werden, wenn keine + // Image darf nur geloescht werden, wenn keine // Veranstaltung mehr auf das Image verweist. // Unbdingt abfragen! @@ -411,12 +436,13 @@ public class DeleteImage_GUI extends JFrame { System.out.println(imageid); System.out.println(imageversion); try { + client.deleteImageServer(imageid, imageversion); if (client.deleteImageData(imageid, imageversion)) { // if (client.deleteImageServer(imageid // ,imageversion)) { - con.closeThriftConnection(); + DeleteImage_GUI di = new DeleteImage_GUI(); @@ -428,7 +454,7 @@ public class DeleteImage_GUI extends JFrame { * } else { * * JOptionPane.showConfirmDialog(null, - * "Löschen vom Server hat leider nicht geklappt!!" + * "Loeschen vom Server hat leider nicht geklappt!!" * , imageversion, * JOptionPane.OK_CANCEL_OPTION); } */ @@ -438,7 +464,7 @@ public class DeleteImage_GUI extends JFrame { JOptionPane .showConfirmDialog( null, - "Löschen von der DB hat leider nicht geklappt!!", + "L\u00f6schen von der DB hat leider nicht geklappt!!", "Fehler", JOptionPane.INFORMATION_MESSAGE); } @@ -455,25 +481,11 @@ public class DeleteImage_GUI extends JFrame { e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // TODO --> client.deleteImageServer(imageid - // ,imageversion) - // das file ist aus der DB raus, aber ist noch - // auf dem Server als Datei hinterlegt. - // dieses muss auch gelöscht werden, um den - // festplattenlatz wieder frei zu geben. - // Hierzu könnte ein löschbefehl an die kommande - // zeile des server geschickt werden - // um das entsprechende file zu löschen. - // identifizieren über den image-namen!! - // z.B. FileUtils.moveFile(tmpFile, new - // File("141.79.128.102:/srv//openslx/nfs/temp/"+ - // tmpFile.getName())); - // FileUtils.ForceDelete (.. ); } else { JOptionPane.showMessageDialog(null, - "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", + "Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", "Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE); } } catch (TException e) { @@ -488,7 +500,7 @@ public class DeleteImage_GUI extends JFrame { } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein eigenes Image aus", + "Bitte w\u00e4hlen Sie ein eigenes Image aus", "Message", JOptionPane.INFORMATION_MESSAGE); } @@ -506,8 +518,13 @@ public class DeleteImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + + // oeffnet das Hauptmen\u00FC con.closeThriftConnection(); + + // oeffnet das Hauptmenue + + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -534,14 +551,77 @@ public class DeleteImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String faq; + // Desktop desktop = Desktop.getDesktop(); + + faq = Links.getFAQ(); + + try { + // Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + + Desktop.getDesktop().browse(new URL(faq).toURI()); + + /* + if (os.indexOf( "win" ) >= 0) { + + // this doesn't support showing urls in the form of "page.html#nameLink" + rt.exec( "rundll32 url.dll,FileProtocolHandler " + url); + + } else if (os.indexOf( "mac" ) >= 0) { + + rt.exec( "open " + url); + + } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) { + + // Do a best guess on unix until we get a platform independent way + // Build a list of browsers to try, in this order. + String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror", + "netscape","opera","links","lynx"}; + + // Build a command string which looks like "browser1 "url" || browser2 "url" ||..." + StringBuffer cmd = new StringBuffer(); + for (int i=0; i<browsers.length; i++) + cmd.append( (i==0 ? "" : " || " ) + browsers[i] +" \"" + url + "\" "); + + rt.exec(new String[] { "sh", "-c", cmd.toString() }); + + */ + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beff\u00FClung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Image> images; try { @@ -553,7 +633,7 @@ public class DeleteImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte f\u00FCr die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -562,7 +642,8 @@ public class DeleteImage_GUI extends JFrame { images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; // System.out.println("id:"+images.get(x).getId()); - // Füge diese Objekte der Tabelle hinzu + // F\u00FCge diese Objekte der Tabelle hinzu + model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 949aeed6..c0ad0a06 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -3,6 +3,7 @@ package gui.image; import gui.intro.MainMenue_GUI; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -14,6 +15,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Map; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +37,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import org.apache.thrift.TException; import models.Image; +import models.Links; import models.person; import server.Server.Client; import thrift.ThriftConnection; @@ -47,14 +52,14 @@ public class EditImageAllgemein_GUI extends JFrame { private JTextField Hochschule; private JTextField EMail; private JTextField imagename; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - private JPanel panel_2; - private JLabel lblNewLabel; - private JTextPane txtpnBitteWhlenSie; - private JPanel buttonPane; - private JButton backButton; - private JButton okButton; + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); + private JPanel panel_2; + private JLabel lblNewLabel; + private JTextPane txtpnBitteWhlenSie; + private JPanel buttonPane; + private JButton backButton; + private JButton okButton; /** * Create the dialog. @@ -63,14 +68,14 @@ public class EditImageAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei einem Klick auf das X + // Beendet die Anwendung bei einem Klick auf das X con.closeThriftConnection(); System.exit(0); } }); - //Verhindert das vergrößern des Fensters + // Verhindert das vergroessern des Fensters setResizable(false); - + try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException @@ -78,13 +83,13 @@ public class EditImageAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - //Setzt den Fenstertitel + // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); - //Zentriert das Fenster in der Bildmitte + // Zentriert das Fenster in der Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); initData(); getContentPane().setLayout(null); @@ -100,11 +105,12 @@ public class EditImageAllgemein_GUI extends JFrame { panel_2.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); } - + txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie + .setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel_2.add(txtpnBitteWhlenSie); } @@ -113,19 +119,20 @@ public class EditImageAllgemein_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - + JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 66, 557, 369); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel label = new JLabel("Vorname: *"); label.setBackground(SystemColor.menu); label.setBounds(10, 245, 125, 20); panel_1.add(label); - + Vorname = new JTextField(); Vorname.setEditable(false); Vorname.setEnabled(false); @@ -134,12 +141,12 @@ public class EditImageAllgemein_GUI extends JFrame { Vorname.setColumns(10); Vorname.setBounds(145, 245, 350, 20); panel_1.add(Vorname); - + JLabel label_7 = new JLabel("Nachname: *"); label_7.setBackground(SystemColor.menu); label_7.setBounds(10, 276, 125, 20); panel_1.add(label_7); - + Nachname = new JTextField(); Nachname.setEnabled(false); Nachname.setEditable(false); @@ -148,12 +155,12 @@ public class EditImageAllgemein_GUI extends JFrame { Nachname.setColumns(10); Nachname.setBounds(145, 276, 350, 20); panel_1.add(Nachname); - + JLabel label_8 = new JLabel("Hochschule: *"); label_8.setBackground(SystemColor.menu); label_8.setBounds(10, 307, 125, 20); panel_1.add(label_8); - + Hochschule = new JTextField(); Hochschule.setEnabled(false); Hochschule.setEditable(false); @@ -162,12 +169,12 @@ public class EditImageAllgemein_GUI extends JFrame { Hochschule.setColumns(10); Hochschule.setBounds(145, 307, 350, 20); panel_1.add(Hochschule); - + JLabel label_9 = new JLabel("E-Mail: *"); label_9.setBackground(SystemColor.menu); label_9.setBounds(10, 338, 125, 20); panel_1.add(label_9); - + EMail = new JTextField(); EMail.setEnabled(false); EMail.setEditable(false); @@ -176,67 +183,70 @@ public class EditImageAllgemein_GUI extends JFrame { EMail.setColumns(10); EMail.setBounds(145, 338, 350, 20); panel_1.add(EMail); - + JLabel lblImagename = new JLabel("Imagename: *"); lblImagename.setBackground(SystemColor.menu); lblImagename.setBounds(10, 31, 125, 20); panel_1.add(lblImagename); - + imagename = new JTextField(); - imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); + imagename + .setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); imagename.setBackground(Color.WHITE); imagename.setText(Image.image.getImagename()); imagename.setColumns(10); imagename.setBounds(145, 31, 350, 20); panel_1.add(imagename); - + JTextArea txtrGebenSieBitte = new JTextArea(); txtrGebenSieBitte.setBackground(SystemColor.menu); txtrGebenSieBitte.setLineWrap(true); txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); - txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + txtrGebenSieBitte + .setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); txtrGebenSieBitte.setBounds(145, 62, 350, 110); panel_1.add(txtrGebenSieBitte); - + JPanel panel = new JPanel(); panel.setBounds(10, 402, 577, 33); contentPanel.add(panel); panel.setLayout(null); panel.setBorder(new EmptyBorder(5, 5, 5, 5)); panel.setBackground(SystemColor.menu); - + JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); lblPflichtfelder.setBounds(10, 442, 136, 14); contentPanel.add(lblPflichtfelder); - + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar - con.closeThriftConnection(); + // Durch den Klick auf Button Hauptmenpue wird dieses Fenster + // unsichtbar und das Hauptmenue sichtbar + EditImageAllgemein_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); } }); lblHauptmen.setForeground(Color.BLUE); lblHauptmen.setBounds(10, 11, 61, 14); contentPanel.add(lblHauptmen); - + JLabel label_1 = new JLabel(">"); label_1.setBounds(69, 11, 13, 14); contentPanel.add(label_1); - + JLabel lblVlimage = new JLabel("VL-Image"); lblVlimage.setForeground(Color.BLUE); lblVlimage.setBounds(81, 11, 45, 14); contentPanel.add(lblVlimage); - + JLabel label_2 = new JLabel(">"); label_2.setBounds(133, 11, 13, 14); contentPanel.add(label_2); - + JLabel lblNewLabel_1 = new JLabel("Bearbeiten"); lblNewLabel_1.setBounds(146, 11, 71, 14); contentPanel.add(lblNewLabel_1); @@ -250,83 +260,135 @@ public class EditImageAllgemein_GUI extends JFrame { backButton = new JButton("Zur\u00FCck"); backButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + + // Setzen der Eingabe im Model, dadurch bleiben die + // Daten bei einem erneuten Aufruf verfuegbar + // Image.image.setImagename(imagename.getText()); - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - //Image.image.setImagename(imagename.getText()); - con.closeThriftConnection(); - SearchEditImage_GUI se=new SearchEditImage_GUI(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); } }); backButton.setActionCommand("CANCEL"); buttonPane.add(backButton); - + } { okButton = new JButton("Weiter"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //check is textfield has content - if(imagename.getText().length() <= 0){ + // check is textfield is empty + if (imagename.getText().length() <= 0) { JOptionPane.showMessageDialog(null, - "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", - JOptionPane.INFORMATION_MESSAGE); + "Bitte geben Sie einen Labornamen ein.", + "Daten nicht vollst\u00e4ndig", + JOptionPane.INFORMATION_MESSAGE); + } else { - Image.image.setNewName(imagename.getText()); - con.closeThriftConnection(); - EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); + + // setze Namen, egal ob alt oder nicht + Image.image.setImagename(imagename.getText()); + System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); + + + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); ea.setVisible(true); dispose(); - }//end else + }// end else } }); - + okButton.setActionCommand("OK"); buttonPane.add(okButton); getRootPane().setDefaultButton(okButton); } } - + JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); - + JSeparator separator_1 = new JSeparator(); separator_1.setBounds(0, 627, 597, 2); getContentPane().add(separator_1); - + JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); - + JMenu mnNewMenu_1 = new JMenu("Hilfe"); menuBar.add(mnNewMenu_1); - + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + //Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + // desktop.browse(faq); + + Desktop.getDesktop().browse(new URL(faq).toURI()); + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); - + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); - //setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs})); - + // setFocusTraversalPolicy(new FocusTraversalOnArray(new + // Component[]{getContentPane(), panel_2, lblNewLabel, + // txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, + // Nachname, label_8, Hochschule, label_9, EMail, lblImagename, + // imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, + // label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, + // okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, + // mntmOtrs})); + } - - public void initData(){ + + public void initData() { try { - - Map<String,String> map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); - if(map.get("internet").equals("0")){ + + Map<String, String> map = client.getImageData( + Image.image.getImageId(), Image.image.getVersion()); + if (map.get("internet").equals("0")) { Image.image.setInternet(false); - } - else - { + } else { Image.image.setInternet(true); } - if(map.get("license").equals("0")){ + if (map.get("license").equals("0")) { Image.image.setLicensed(false); - } - else{ + } else { Image.image.setLicensed(true); } Image.image.setImagename(map.get("name")); @@ -336,10 +398,9 @@ public class EditImageAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } } - } diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 631e3c2d..1bbfa699 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; + import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +35,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; +import models.Links; @SuppressWarnings("serial") public class EditImageTechnisch_GUI extends JFrame { @@ -61,7 +64,7 @@ public class EditImageTechnisch_GUI extends JFrame { } }); - // Verhindert das Vergrößern des Fensters + // Verhindert das Vergroeßern des Fensters setResizable(false); try { @@ -192,7 +195,7 @@ public class EditImageTechnisch_GUI extends JFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, - "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, + "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(10, 172, 557, 338); @@ -285,7 +288,7 @@ public class EditImageTechnisch_GUI extends JFrame { } else { Image.image.setLicensed(false); } - // Öffnet das vorherige Fenster + // oeffnet das vorherige Fenster EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI(); ei.setVisible(true); dispose(); @@ -314,7 +317,7 @@ public class EditImageTechnisch_GUI extends JFrame { } else { Image.image.setLicensed(false); } - // Öffnet das nächste Fenster + // oeffnet das naechste Fenster FTPEditUploader_GUI ea = new FTPEditUploader_GUI(); ea.setVisible(true); dispose(); @@ -341,11 +344,42 @@ public class EditImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); } - } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 49fcf0d0..3adb426a 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,6 +35,8 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; +import models.SessionData; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -41,6 +44,9 @@ import thrift.ThriftConnection; //import util.XMLCreator; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPCreateUploader_GUI extends JFrame implements @@ -51,8 +57,7 @@ public class FTPCreateUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - //String host = "141.79.128.121"; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; server.User user; String filename = ""; @@ -68,8 +73,8 @@ public class FTPCreateUploader_GUI extends JFrame implements double speed; long bytesread; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton finishButton = new JButton("Fertigstellen"); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -110,6 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -295,26 +301,6 @@ public class FTPCreateUploader_GUI extends JFrame implements separator_1.setBounds(0, 627, 597, 2); contentPanel.add(separator_1); - JButton btnCopyFileTo = new JButton("Copy File to Prod"); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - System.out.println("Copying file to " + user.path + "/" - + uploadFile.getName()); - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - } - }); - btnCopyFileTo.setBounds(102, 375, 173, 23); - contentPanel.add(btnCopyFileTo); - JLabel lblSchritt_1 = new JLabel("Schritt 1:"); lblSchritt_1.setBounds(24, 128, 57, 14); contentPanel.add(lblSchritt_1); @@ -347,7 +333,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -364,7 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnZurck.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); - thrift.closeThriftConnection(); + CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI(); m.setVisible(true); } @@ -378,9 +364,37 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + } + }); + menu.add(menuItem_1); setVisible(true); } @@ -392,6 +406,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnUploadStarten.setText("Bitte warten"); try { + System.out.println("Test"); user = client.getFtpUser(); System.out.println("FTP name" + user.userName); System.out.println("FTP path" + user.path); @@ -413,8 +428,10 @@ public class FTPCreateUploader_GUI extends JFrame implements + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename() + ".vmdk"); + System.out.println("Uploading to host: "+host); + task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); + user.path+"temp/", uploadFile); task.addPropertyChangeListener(this); task.execute(); @@ -440,8 +457,10 @@ public class FTPCreateUploader_GUI extends JFrame implements // Fertigstellen erlauben wenn upload abgeschlossen if (progress == 100) { finishButton.setEnabled(true); + } else { finishButton.setEnabled(false); + } } @@ -487,7 +506,7 @@ public class FTPCreateUploader_GUI extends JFrame implements public boolean writeData() { try { - + client.writeVLdata(Image.image.getImagename(), person.verantwortlicher.getUsername(), person.verantwortlicher.getVorname(), @@ -495,10 +514,11 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), + person.verantwortlicher.getFakultaet(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), - "/srv/openslx/nfs/temp/" + Image.image.getNewName()); + "temp/" + Image.image.getNewName(),false,Image.image.getFilesize()); + client.startFileCopy(Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index ec92396b..97a29849 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -6,6 +6,8 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Toolkit; import java.io.File; +import java.io.IOException; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -31,10 +33,18 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; import models.Image; +import models.Links; +import models.SessionData; + import org.apache.thrift.TException; import server.Server.Client; import server.User; import thrift.ThriftConnection; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { @@ -46,7 +56,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JLabel downspeed; User user; JProgressBar progressBar; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; String downloadFile = ""; static String arg = ""; @@ -60,8 +70,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener long bytesread; JLabel labelZeit; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zur\u00FCck"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnMainMenu = new JButton("Hauptmen\u00FC"); @@ -77,7 +87,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + con.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -217,7 +227,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JPanel panel = new JPanel(); panel.setLayout(null); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); + panel.setBounds(10, 24, 577, 57); contentPanel.add(panel); JLabel lblImageDownloader = new JLabel("Image Downloader"); @@ -233,29 +243,29 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener panel.add(txtpnWhlenSieEinen); JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); + separator.setBounds(0, 88, 597, 2); contentPanel.add(separator); JLabel label_1 = new JLabel("Hauptmen\u00FC"); label_1.setForeground(Color.BLUE); - label_1.setBounds(20, 88, 61, 20); + label_1.setBounds(20, 92, 61, 20); contentPanel.add(label_1); JLabel label_2 = new JLabel(">"); - label_2.setBounds(80, 91, 14, 14); + label_2.setBounds(80, 95, 14, 14); contentPanel.add(label_2); JLabel label_3 = new JLabel("VL-Image"); label_3.setForeground(Color.BLUE); - label_3.setBounds(91, 88, 46, 20); + label_3.setBounds(91, 92, 46, 20); contentPanel.add(label_3); JLabel label_4 = new JLabel(">"); - label_4.setBounds(139, 91, 14, 14); + label_4.setBounds(139, 95, 14, 14); contentPanel.add(label_4); JLabel label_5 = new JLabel("Neu/Bearbeiten"); - label_5.setBounds(149, 91, 108, 14); + label_5.setBounds(149, 95, 108, 14); contentPanel.add(label_5); JSeparator separator_1 = new JSeparator(); @@ -278,6 +288,53 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Klicken Sie auf \"Fertigstellen\"."); lblKlickenSieAuf.setBounds(98, 423, 241, 14); contentPanel.add(lblKlickenSieAuf); + + JMenuBar menuBar = new JMenuBar(); + menuBar.setBounds(0, 0, 597, 21); + contentPanel.add(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + menu.add(menuItem_1); { JPanel buttonPane = new JPanel(); buttonPane.setBackground(UIManager.getColor("Button.background")); @@ -298,7 +355,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Debug-Message", JOptionPane.ERROR_MESSAGE); } } - thrift.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -311,7 +368,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener btnMainMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - thrift.closeThriftConnection(); + MainMenue_GUI mm = new MainMenue_GUI(); mm.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index e0c0b6c4..99fc034b 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,12 +35,17 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; +import models.SessionData; import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPEditUploader_GUI extends JFrame implements @@ -50,7 +56,7 @@ public class FTPEditUploader_GUI extends JFrame implements private final JPanel contentPanel = new JPanel(); JLabel lblPath; JProgressBar progressBar; - String host = "141.79.128.102"; + String host = SessionData.session.getServerAdress(); int port = 21; server.User user; String filename = ""; @@ -67,11 +73,10 @@ public class FTPEditUploader_GUI extends JFrame implements long bytesread; boolean taskrun = false; int progress = 0; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); - JButton btnCopyFileTo = new JButton("Copy File to Prod"); JButton finishButton = new JButton("Fertigstellen"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -108,6 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -285,23 +291,6 @@ public class FTPEditUploader_GUI extends JFrame implements separator_1.setBounds(0, 627, 597, 2); contentPanel.add(separator_1); - btnCopyFileTo.setEnabled(false); - btnCopyFileTo.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - try { - client.startFileCopy(user.path + "/" + uploadFile.getName()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - } - }); - btnCopyFileTo.setBounds(102, 375, 173, 23); - contentPanel.add(btnCopyFileTo); - JLabel lblSchritt_1 = new JLabel("Schritt 1:"); lblSchritt_1.setBounds(24, 128, 57, 14); contentPanel.add(lblSchritt_1); @@ -346,7 +335,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } - thrift.closeThriftConnection(); + } }); btnZurck.addActionListener(new ActionListener() { @@ -366,9 +355,49 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + menu.add(menuItem_1); setVisible(true); } @@ -392,12 +421,13 @@ public class FTPEditUploader_GUI extends JFrame implements "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + Image.image.setNewName(formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); + + Image.image.getImagename()+ ".vmdk"); task = new UploadTask(host, port, user.userName, user.password, - user.path, uploadFile); + user.path+"temp/", uploadFile); task.addPropertyChangeListener(this); task.execute(); @@ -468,11 +498,14 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean updateData() { try { + System.out.println("NewName="+Image.image.getNewName()); + System.out.println("OldName="+Image.image.getImagename()); client.updateImageData(Image.image.getImagename(), - Image.image.getNewName(), Image.image.isLicensed(), + Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), - Image.image.getVersion()); + Image.image.getVersion(), false,Image.image.getFilesize()); + client.startFileCopy(Image.image.getNewName()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 7c35bf00..30e2b06d 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -68,9 +70,17 @@ public class SearchEditImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + Client client = models.Client.clientcon.getClient(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( @@ -94,7 +104,7 @@ public class SearchEditImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -184,29 +194,29 @@ public class SearchEditImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(365, 106, 155, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List<String> list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -216,12 +226,12 @@ public class SearchEditImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -237,8 +247,8 @@ public class SearchEditImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü - con.closeThriftConnection(); + // oeffnet das Hauuetmenue + SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -358,7 +368,7 @@ public class SearchEditImage_GUI extends JFrame { JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Öffnet den Downloader + // oeffnet den Downloader if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages.getValueAt( @@ -374,11 +384,11 @@ public class SearchEditImage_GUI extends JFrame { SearchEditImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image für den Download aus", + "Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } @@ -395,8 +405,8 @@ public class SearchEditImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -410,7 +420,7 @@ public class SearchEditImage_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + // check if user is in correct tab if (tabbedPane.getSelectedIndex() == 0) { @@ -432,18 +442,18 @@ public class SearchEditImage_GUI extends JFrame { 8).toString(); Image.image.setVersion(imageversion); - con.closeThriftConnection(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }// end check if row is selected } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein eigenes Image aus.", + "Bitte w\u00e4hlen Sie ein eigenes Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }//end check if correct tab is selected } @@ -468,14 +478,48 @@ public class SearchEditImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Image> images; try { @@ -487,7 +531,7 @@ public class SearchEditImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -495,7 +539,7 @@ public class SearchEditImage_GUI extends JFrame { images.get(x).getUserData(), images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 4e6e7046..f9c3811b 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -68,9 +70,17 @@ public class SearchImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + Client client = models.Client.clientcon.getClient(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( @@ -94,7 +104,7 @@ public class SearchImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -184,29 +194,29 @@ public class SearchImage_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(360, 106, 160, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List<String> list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -216,12 +226,12 @@ public class SearchImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -237,8 +247,8 @@ public class SearchImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü - con.closeThriftConnection(); + // oeffnet das Hauuetmenue + SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -358,7 +368,7 @@ public class SearchImage_GUI extends JFrame { JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Öffnet den Downloader + // oeffnet den Downloader if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages.getValueAt( @@ -374,11 +384,11 @@ public class SearchImage_GUI extends JFrame { SearchImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image für den Download aus", + "Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } @@ -395,8 +405,8 @@ public class SearchImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -423,14 +433,48 @@ public class SearchImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Image> images; try { @@ -442,7 +486,7 @@ public class SearchImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -450,7 +494,7 @@ public class SearchImage_GUI extends JFrame { images.get(x).getUserData(), images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 49d7810b..67472c17 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -33,6 +34,8 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + @SuppressWarnings("serial") public class SearchMethodLecture_GUI extends JFrame { @@ -111,7 +114,7 @@ public class SearchMethodLecture_GUI extends JFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, - "Wählen Sie bitte die Suchmethode Ihrer Suche", + "W\u00e4hlen Sie bitte die Suchmethode Ihrer Suche", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 36, 557, 369); contentPanel.add(panel_1); @@ -242,9 +245,43 @@ public class SearchMethodLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 988a8b38..fd1246bc 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -33,8 +33,12 @@ import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @@ -164,7 +168,7 @@ public class BillOfRights_GUI extends JFrame { chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen."); chckbxAkzeptieren.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - //Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht + //Beim Akzeptieren der Bestaetigung wird der Weiter-Button verfuegbar gemacht if(chckbxAkzeptieren.isSelected()==true) { @@ -189,9 +193,43 @@ public class BillOfRights_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index a2de7428..34469617 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -29,6 +29,7 @@ import org.apache.thrift.TException; import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.ThriftConnection; import thrift.UserInfo; import config.config_file; import javax.swing.SwingConstants; @@ -54,7 +55,7 @@ public class Login_GUI extends JFrame { EventQueue.invokeLater(new Runnable() { public void run() { try { - // Prüfe und Erzeuge gegebenfalls Config + // Pruefe und Erzeuge gegebenfalls Config config_file cf = new config_file(); boolean conf = cf.createConfig(); if (conf == true) { @@ -69,8 +70,7 @@ public class Login_GUI extends JFrame { } catch (Exception e) { e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getStackTrace(), + JOptionPane.showMessageDialog(null, e.getStackTrace(), "Message", JOptionPane.ERROR_MESSAGE); } } @@ -88,8 +88,9 @@ public class Login_GUI extends JFrame { } }); - // Fenster darf nicht vergrößert werden + // Fenster darf nicht vergroessert werden setResizable(false); + try { // Setzt das Look and Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -98,14 +99,14 @@ public class Login_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen setTitle("Dozentenmodul *Prototyp*"); - // Aktion die beim Schließen durchgeführt werden soll + // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - // Größe des Fensters definieren + // Groesse des Fensters definieren Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 400) / 2; int left = (screenSize.width - 603) / 2; @@ -119,9 +120,9 @@ public class Login_GUI extends JFrame { setContentPane(contentPane); // Layout setzen contentPane.setLayout(null); - // Label für das Logo erzeugen + // Label fuer das Logo erzeugen JLabel imgLabel = new JLabel(); - // Größe und Position des Logos festelegen + // Groesse und Position des Logos festelegen imgLabel.setBounds(150, 11, 350, 142); // Pfadangabe des Logos @@ -130,15 +131,15 @@ public class Login_GUI extends JFrame { // Skalierung des Logos Image scaled = icon.getImage().getScaledInstance(270, 64, 0); imgLabel.setIcon(new ImageIcon(scaled)); - // Hinzufügen des Logos in das Fenster + // Hinzufuegen des Logos in das Fenster contentPane.add(imgLabel); - // Erzeugen und Hinzufügen des Labels + // Erzeugen und Hinzufuegen des Labels JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); LabelUser.setBounds(111, 164, 134, 20); contentPane.add(LabelUser); - // Erzeugen und Hinzufügen des Textfeldes + // Erzeugen und Hinzufuegen des Textfeldes lblusername = new JTextField(); lblusername .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); @@ -151,12 +152,12 @@ public class Login_GUI extends JFrame { contentPane.add(lblusername); lblusername.setColumns(10); - // Erzeugen und Hinzufügen des Labels + // Erzeugen und Hinzufuegen des Labels JLabel LabelPass = new JLabel("bwIDM-Passwort:"); LabelPass.setBounds(111, 195, 134, 20); contentPane.add(LabelPass); - // Erzeugen, Hinzufügen und definierung der Aktion des Buttons + // Erzeugen, Hinzufuegen und definierung der Aktion des Buttons JButton BtnLogin = new JButton("Login"); BtnLogin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -167,7 +168,7 @@ public class Login_GUI extends JFrame { BtnLogin.setBounds(292, 244, 237, 23); contentPane.add(BtnLogin); - // Erzeugen und Hinzufügen des Passwortfeldes + // Erzeugen und Hinzufuegen des Passwortfeldes lblpass = new JPasswordField(); lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); lblpass.addActionListener(new ActionListener() { @@ -207,70 +208,84 @@ public class Login_GUI extends JFrame { SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); System.out.println("Satellit-Adresse: " + result.serverAddress); - + + //set connection to bwLehrpoolSuiteServer + ThriftConnection bwthrift=new ThriftConnection(); + server.Server.Client bwClient=bwthrift.getThriftConnection(); + models.Client.clientcon.setClient(bwClient); + + System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId - + ", mein Token für den Satelliten " + + ", mein Token f\u00fcr den Satelliten " + result.authToken); - if (login == true) { + /* + * + * + * Hier Daten speichern + */ + if (SessionData.session.getAuthToken() == null) { + System.out.println("Token ist null"); + JOptionPane.showMessageDialog(null, + "Error: Token ist null", "Token defekt", + JOptionPane.ERROR_MESSAGE); + } + System.out.println("Hole jetzt Infos aus SessionData..."); + UserInfo user = client.getUserFromToken(SessionData.session + .getAuthToken()); + + String hochschule = user.eMail.substring( + user.eMail.indexOf("@") + 1); + + person.verantwortlicher.setUsername(lblusername.getText() + .substring(0, lblusername.getText().indexOf("@"))); + person.verantwortlicher.setName(user.lastName); + person.verantwortlicher.setVorname(user.firstName); + person.verantwortlicher.setEMail(user.eMail); + person.verantwortlicher.setHochschule(hochschule); + try { + // Lege config File an und entscheide welches Fenster + // als naechstes geoeffnet wird Wini ini = new Wini( new File( "C:\\Users\\" + System.getProperty("user.name") + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - // Prüfe ob Bills Of Rights schon akzeptiert wurden, + // Pruefe ob Bills Of Rights schon akzeptiert wurden, // wenn // nicht zeige diese an if (ini.get("main", "BillOfRights", boolean.class) == false) { // Erstellen einer Instanz der Aktionsauswahl BillOfRights_GUI re = new BillOfRights_GUI(); re.setVisible(true); - // Schließen des Fensters nach erfolgreichen Login + // Schliessen des Fensters nach erfolgreichen Login setVisible(false); } else { - // Prüfe ob die Links zu vmware angezeigt werden + // Pruefe ob die Links zu vmware angezeigt werden // sollen if (ini.get("main", "vmware", boolean.class) == false) { VmWareLink_GUI vm = new VmWareLink_GUI(); vm.setVisible(true); setVisible(false); } else { - - if(SessionData.session.getAuthToken()==null){ - System.out.println("Token ist null"); - } - UserInfo user = client.getUserFromToken(SessionData.session.getAuthToken()); - - String hochschule = user.eMail.substring( - user.eMail.indexOf("@") + 1, - user.eMail.indexOf(".", - user.eMail.indexOf("@"))); - - person.verantwortlicher.setUsername(lblusername.getText().substring(0, lblusername.getText().indexOf("@"))); - person.verantwortlicher.setName(user.lastName); - person.verantwortlicher - .setVorname(user.firstName); - person.verantwortlicher.setEMail(user.eMail); - person.verantwortlicher - .setHochschule(hochschule); - - // Öffne das Hauprmenü + + // oeffne das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); setVisible(false); } } - } catch (IOException | TException e) { + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, e.getCause() + "\n" + + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } } else { @@ -282,7 +297,8 @@ public class Login_GUI extends JFrame { // package from server is null login = false; lblConnectionInfo.setForeground(Color.red); - lblConnectionInfo.setText("Fehler: Client nicht mit Server verbunden."); + lblConnectionInfo + .setText("Fehler: Client nicht mit Server verbunden."); } @@ -292,20 +308,20 @@ public class Login_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", + "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort \u00fcberpr\u00fcfen.", "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getMessage(), "Message", + JOptionPane.ERROR_MESSAGE); return; } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); return; } }// end performLogin @@ -320,7 +336,8 @@ public class Login_GUI extends JFrame { } else { // client has returned with error isClientReturnedCorrectly = false; - System.out.println("Fehler: Client hat von Masterserver (" + masterServerIP + System.out.println("Fehler: Client hat von Masterserver (" + + masterServerIP + ") keine korrekten Verbindungsdaten erhalten."); } diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4817e786..401cbda0 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -7,7 +7,6 @@ import java.awt.FlowLayout; import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -33,7 +32,11 @@ import java.awt.ScrollPane; import javax.swing.JTextArea; import javax.swing.ImageIcon; +import models.Links; import models.SessionData; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -53,18 +56,6 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - MainMenue_GUI dialog = new MainMenue_GUI(); - dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - }// end main /** * Create the dialog. @@ -166,7 +157,7 @@ public class MainMenue_GUI extends JFrame { JPanel panelDesc = new JPanel(); panelDesc.setLayout(null); panelDesc.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Erklärung", + .getBorder("TitledBorder.border"), "Erkl\u00e4rung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelDesc.setBackground(SystemColor.menu); panelDesc.setBounds(290, 146, 270, 170); @@ -181,7 +172,7 @@ public class MainMenue_GUI extends JFrame { txtDesc.setBackground(SystemColor.menu); scrollPaneDesc.add(txtDesc); // Pro AUswahl - txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."); + txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschlie\u00dfend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung f\u00fcr eine Veranstaltung."); panelDesc.add(scrollPaneDesc); JPanel panelVeranstaltung = new JPanel(); @@ -247,11 +238,11 @@ public class MainMenue_GUI extends JFrame { panelNews.add(scrollPaneNews); /* - * Funktion Texte für das Klicken der RadioButtons + * Funktion Texte f\u00fcr das Klicken der RadioButtons */ rdbtnImageNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."; + descNewImage = "Legen Sie ein neues Image an und laden Sie anschlie\u00dfend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung f\u00fcr eine Veranstaltung."; txtDesc.setText(descNewImage); } }); @@ -263,19 +254,19 @@ public class MainMenue_GUI extends JFrame { }); rdbtnImageDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese."; + descDeleteImage = "Suchen Sie alte und nicht mehr ben\u00f6tigte Images und l\u00f6schen Sie diese."; txtDesc.setText(descDeleteImage); } }); rdbtnImageSearchDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen."; + descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen \u00fcberblick \u00fcber alle verf\u00fcgbaren Images. Sie k\u00f6nnen gew\u00fcnschte Images umgehend herunterladen."; txtDesc.setText(descSearchImage); } }); rdbtnLectureNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; + descNewLecture = "Legen Sie eine neue Veranstaltung an und verkn\u00fcpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; txtDesc.setText(descNewLecture); } }); @@ -287,13 +278,13 @@ public class MainMenue_GUI extends JFrame { }); rdbtnLectureDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + descDeleteLecture = "Suchen und l\u00f6schen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; txtDesc.setText(descDeleteLecture); } }); rdbtnLectureSearch.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; + descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen \u00fcberblick \u00fcber alle verf\u00fcgbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes f\u00fcr Ihre Vorlesung."; txtDesc.setText(descSearchLecture); } }); @@ -302,7 +293,7 @@ public class MainMenue_GUI extends JFrame { */ JLabel lblGrafik = new JLabel(""); - // ToolTipp für Grafik + // ToolTipp fuer Grafik lblGrafik .setToolTipText("<html>" + "Ein virtuelles Labor besteht immer aus den beiden Komponenten <br>" @@ -407,9 +398,43 @@ public class MainMenue_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); }// end main diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 1c0a51c0..4d610587 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -7,7 +7,6 @@ import java.awt.FlowLayout; import java.awt.Toolkit; import javax.swing.JFrame; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.UIManager; @@ -29,12 +28,13 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JCheckBox; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; - +import models.Links; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; @@ -44,19 +44,11 @@ public class VmWareLink_GUI extends JFrame { private final JPanel contentPanel = new JPanel(); String[] result; + //String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; + //String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; JCheckBox chckbxNewCheckBox; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - VmWareLink_GUI dialog = new VmWareLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + private JButton btnWindows; + /** * Create the dialog. @@ -167,13 +159,36 @@ public class VmWareLink_GUI extends JFrame { lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14); contentPanel.add(lbllinuxvmwarePlayer); - JLabel lblvmwarePlayerDownload = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>"); - lblvmwarePlayerDownload.setBounds(10, 118, 499, 14); - contentPanel.add(lblvmwarePlayerDownload); + btnWindows = new JButton("VMware Player herunterladen"); + btnWindows.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + try { + URI windows= new URI(Links.getUriWindows()); + openWebpage(windows); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + }); + btnWindows.setBounds(10, 119, 186, 23); + contentPanel.add(btnWindows); - JLabel lblvmwarePlayerDownload_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>"); - lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14); - contentPanel.add(lblvmwarePlayerDownload_1); + JButton btnLinux = new JButton("VMware Player herunterladen"); + btnLinux.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + URI windows= new URI(Links.getUriLinux()); + openWebpage(windows); + } catch (URISyntaxException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + } + }); + btnLinux.setBounds(10, 203, 186, 23); + contentPanel.add(btnLinux); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 630, 587, 33); @@ -211,16 +226,62 @@ public class VmWareLink_GUI extends JFrame { menuBar.add(mnHilfe); { JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnHilfe.add(mntmFaq); } { - JMenuItem mntmHilfe = new JMenuItem("Hilfe"); - mnHilfe.add(mntmHilfe); + JMenuItem mntmOTRS = new JMenuItem("OTRS"); + mntmOTRS.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + mnHilfe.add(mntmOTRS); } } } - } -} + }//end constructor + + public static void openWebpage(URI uri) { + Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; + if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) { + try { + desktop.browse(uri); + } catch (Exception e) { + e.printStackTrace(); + } + } + }// end openWebpage + +}// end class diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 02946571..21d84e2a 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -32,9 +32,11 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; import java.util.Calendar; import java.util.Date; @@ -396,7 +398,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", + "Das End-Datum liegt vor dem Start-Datum. Bitte \u00e4ndern.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { @@ -417,7 +419,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // bereit isDateMaxLifeTimeCorrect = true; } - // Prüfen ob alles eingegeben wurde + // Pruefen ob alles eingegeben wurde if (txtFldVeranstaltungsname.getText().isEmpty() == true || description.getText().isEmpty() == true) { // mind 1 Textfeld ist leer @@ -439,7 +441,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { } else { Lecture.lecture.setActive(false); } - // Prüfe ob alle Eingaben korrekt sind, dann mache + // Pruefe ob alle Eingaben korrekt sind, dann mache // weiter if (isAllInformationReady == true && isDateMaxLifeTimeCorrect == true @@ -491,9 +493,43 @@ public class CreateLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 285a4ff6..ff19ed13 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -44,6 +45,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -66,7 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -88,6 +90,7 @@ public class CreateLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } @@ -347,7 +350,7 @@ public class CreateLectureLink_GUI extends JFrame { JButton cancelButton = new JButton("Zur\u00FCck"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI(); eVAG.setVisible(true); dispose(); @@ -395,14 +398,14 @@ public class CreateLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät()); + person.verantwortlicher.getFakultaet()); JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", + "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); - // zurück zum Menü + // zurueck zum Menue MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); } catch (TException e1) { @@ -418,13 +421,13 @@ public class CreateLectureLink_GUI extends JFrame { e1.getCause()+"\n"+e1.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - con.closeThriftConnection(); + dispose(); } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); } @@ -457,9 +460,43 @@ public class CreateLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 57d36515..ae228c1e 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -43,6 +44,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -63,10 +66,10 @@ public class DeleteLecture_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( @@ -100,7 +103,7 @@ public class DeleteLecture_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -187,27 +190,27 @@ public class DeleteLecture_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche*Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(336, 106, 184, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -336,18 +339,18 @@ public class DeleteLecture_GUI extends JFrame { //a row is selected //ask for confirmation eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?", + "Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?", JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { //user has confirmed deletion, now get the ID of the selected lecture lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); - System.out.println("Lösche Lecture "+lectureID); + System.out.println("L\u00f6sche Lecture "+lectureID); try { - if(client.deleteLecture(lectureID)){ - System.out.println("Löschen erfolgreich"); + if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ + System.out.println("L\u00f6schen erfolgreich"); //delete successful - con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); dl.setVisible(true); dispose(); @@ -356,7 +359,7 @@ public class DeleteLecture_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Löschen aus Datenbank fehlgeschlagen.", + "L\u00f6schen aus Datenbank fehlgeschlagen.", "Fehler", JOptionPane.INFORMATION_MESSAGE); } @@ -382,8 +385,8 @@ public class DeleteLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -410,14 +413,48 @@ public class DeleteLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Lecture> lectures; try { @@ -428,7 +465,7 @@ public class DeleteLecture_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -437,7 +474,7 @@ public class DeleteLecture_GUI extends JFrame { 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 + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 348b1c77..67f86a13 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -34,9 +34,12 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; + import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; import javax.swing.ButtonGroup; @@ -242,6 +245,7 @@ public class EditLectureAllgemein_GUI extends JFrame { panel_2.add(textFieldLaborname); JTextArea textArea = new JTextArea(); + textArea.setEditable(false); textArea.setWrapStyleWord(true); textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); textArea.setLineWrap(true); @@ -258,6 +262,7 @@ public class EditLectureAllgemein_GUI extends JFrame { scrollPane.setBounds(200, 104, 347, 78); panel_2.add(scrollPane); description = new JTextArea(); + description.setFont(new Font("Tahoma", Font.PLAIN, 11)); description.setText(Lecture.lecture.getDesc()); description.setLineWrap(true); scrollPane.add(description); @@ -403,9 +408,43 @@ public class EditLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 4160f855..f995d70d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -2,6 +2,7 @@ package gui.lecture; import gui.intro.MainMenue_GUI; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -15,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -43,6 +45,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -64,8 +67,8 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -87,6 +90,7 @@ public class EditLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } }); @@ -116,8 +120,7 @@ public class EditLectureLink_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Image verlinken"); + JLabel lblNewLabel = new JLabel("Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -181,17 +184,17 @@ public class EditLectureLink_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(317, 106, 203, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox<String>(); @@ -355,7 +358,7 @@ public class EditLectureLink_GUI extends JFrame { } { JButton cancelButton = new JButton( - "Veranstaltung ändern und abschlie\u00DFen"); + "Veranstaltung \u00e4ndern und abschlie\u00DFen"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -372,9 +375,11 @@ public class EditLectureLink_GUI extends JFrame { .toString(); try { - - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - client.updateLecturedata(Lecture.lecture.getName(), + + DateFormat formatter = new SimpleDateFormat( + "yyyy-MM-dd hh:mm:ss"); + client.updateLecturedata( + Lecture.lecture.getName(), Lecture.lecture.getNewName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), @@ -391,9 +396,16 @@ public class EditLectureLink_GUI extends JFrame { person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultät(), + person.verantwortlicher.getFakultaet(), Lecture.lecture.getid()); - + + JOptionPane + .showMessageDialog( + null, + "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", + "Veranstaltung angelegt", + JOptionPane.INFORMATION_MESSAGE); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -402,11 +414,13 @@ public class EditLectureLink_GUI extends JFrame { } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); } + + MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); dispose(); @@ -439,9 +453,44 @@ public class EditLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index badcf86a..7bd42034 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -47,6 +48,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -67,12 +69,20 @@ public class EditLectureSearch_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + Client client = models.Client.clientcon.getClient(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( @@ -103,7 +113,7 @@ public class EditLectureSearch_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -189,27 +199,27 @@ public class EditLectureSearch_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(326, 106, 194, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -336,8 +346,8 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -425,7 +435,7 @@ public class EditLectureSearch_GUI extends JFrame { Lecture.lecture.setActive(false); } - con.closeThriftConnection(); + // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(); @@ -435,14 +445,14 @@ public class EditLectureSearch_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Bitte wählen Sie ein eigenes Image aus", + "Bitte w\u00f4hlen Sie ein eigenes Image aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00f4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }// end check if a row is selected @@ -469,14 +479,48 @@ public class EditLectureSearch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Lecture> lectures; try { @@ -487,7 +531,7 @@ public class EditLectureSearch_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -496,7 +540,7 @@ public class EditLectureSearch_GUI extends JFrame { 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 + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 095ca7ef..8d605ef3 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -32,6 +32,12 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; + @SuppressWarnings("serial") public class ExtendedSearchForImages_GUI extends JFrame { @@ -57,12 +63,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { * Create the dialog. */ public ExtendedSearchForImages_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - System.exit(0); - } - }); + setResizable(false); try { @@ -228,9 +229,43 @@ public class ExtendedSearchForImages_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 413f1084..18eb411a 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -42,6 +43,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -62,12 +65,20 @@ public class SearchLecture_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + Client client = models.Client.clientcon.getClient(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){ + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll); final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>( @@ -98,7 +109,7 @@ public class SearchLecture_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -184,27 +195,27 @@ public class SearchLecture_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "<html><u>Erweiterte Suche</u></html>"); + "<html><u>Erweiterte Suche *Folgt noch*</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); - ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); - es.setVisible(true); + // oeffnet das Fenster Extended GUI + + //ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); + //es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - lblErweiterteSuche.setBounds(431, 106, 89, 14); + lblErweiterteSuche.setBounds(315, 106, 205, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -331,8 +342,8 @@ public class SearchLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü - con.closeThriftConnection(); + // oeffnet das Hauptmenue + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -359,14 +370,48 @@ public class SearchLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Lecture> lectures; try { @@ -377,7 +422,7 @@ public class SearchLecture_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -386,7 +431,7 @@ public class SearchLecture_GUI extends JFrame { 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 + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java new file mode 100644 index 00000000..6dc587f1 --- /dev/null +++ b/Dozentenmodul/src/models/Client.java @@ -0,0 +1,19 @@ +package models; + +public class Client { + + private server.Server.Client client; + + public static Client clientcon=new Client(); + + public server.Server.Client getClient() { + return client; + } + + public void setClient(server.Server.Client client) { + this.client = client; + } + + + +} diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index cdc8264c..0b3c936e 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -6,13 +6,22 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; private int cpu; + private long filesize; public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } @@ -61,4 +70,11 @@ public class Image { public void setVersion(String version) { this.version = version; } + public long getFilesize() { + return filesize; + } + public void setFilesize(long filesize) { + this.filesize = filesize; + } + } diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java new file mode 100644 index 00000000..8b11c0bc --- /dev/null +++ b/Dozentenmodul/src/models/Links.java @@ -0,0 +1,26 @@ +package models; + +public class Links { + + private static String FAQ = "http://bwlehrpool.hs-offenburg.de/"; + private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl"; + private static String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; + private static String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"; + + public static String getFAQ() { + return FAQ; + } + + public static String getOTRS() { + return OTRS; + } + + public static String getUriWindows() { + return uriWindows; + } + + public static String getUriLinux() { + return uriLinux; + } + +} diff --git a/Dozentenmodul/src/models/SessionData.java b/Dozentenmodul/src/models/SessionData.java index 3b91e1a2..187dc59f 100644 --- a/Dozentenmodul/src/models/SessionData.java +++ b/Dozentenmodul/src/models/SessionData.java @@ -1,10 +1,12 @@ 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; } diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index 435f3c1d..67b6b84e 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -11,15 +11,10 @@ public class person{ private String Hochschule; private String EMail; private String Tel; - private String Fakultät; + private String Fakultaet; private boolean ischecked; - - - - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); - + //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); @@ -60,11 +55,11 @@ public class person{ public void setTel(String tel) { Tel = tel; } - public String getFakultät() { - return Fakultät; + public String getFakultaet() { + return Fakultaet; } - public void setFakultät(String fakultät) { - Fakultät = fakultät; + public void setFakultaet(String fakultaet) { + Fakultaet = fakultaet; } public boolean isIschecked() { return ischecked; diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index 41e89182..11a27368 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -14,8 +14,8 @@ import thrift.ImageServer.Client; public class MasterThriftConnection { - //public static final String MASTERSERVERIP="132.230.4.16"; - public static final String MASTERSERVERIP="127.0.0.1"; + public static final String MASTERSERVERIP="132.230.4.16"; + //public static final String MASTERSERVERIP="127.0.0.1"; final TTransport transport = new TSocket(MASTERSERVERIP, 9090); @@ -25,7 +25,7 @@ public class MasterThriftConnection { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich!"); + System.out.println("Keine Verbindung m\u00f6glich!"); JOptionPane.showMessageDialog(null, e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 7652fbe7..3eec5d25 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -17,23 +17,28 @@ public class ThriftConnection { private String satAddress = ""+SessionData.session.getServerAdress(); final TTransport transport = new TSocket(satAddress, 9090); - //final TTransport transport = new TSocket("141.79.128.102", 9090); + + public ThriftConnection() { + // TODO Auto-generated constructor stub + } + public Client getThriftConnection() { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich! Satellit="+satAddress); + System.out.println("Keine Verbindung m\u00f6glich! Satellit="+satAddress); e.printStackTrace(); JOptionPane.showMessageDialog(null, e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); - //System.out.println("Keine Verbindung möglich! Satellit="); + //System.out.println("Keine Verbindung moeglich! Satellit="); return null; } final TProtocol protocol = new TBinaryProtocol(transport); + final Server.Client client = new Server.Client(protocol); System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); diff --git a/Dozentenmodulserver/.classpath b/Dozentenmodulserver/.classpath index a5e7594d..7c84817e 100644 --- a/Dozentenmodulserver/.classpath +++ b/Dozentenmodulserver/.classpath @@ -7,5 +7,7 @@ <classpathentry kind="lib" path="lib/libthrift-0.9.1.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
+ <classpathentry kind="lib" path="lib/ini4j-0.5.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-simple-1.7.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class Binary files differindex 1b204bfe..81db32c2 100644 --- a/Dozentenmodulserver/bin/server/BinaryListener.class +++ b/Dozentenmodulserver/bin/server/BinaryListener.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class Binary files differindex 751c661d..5a2f6467 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class Binary files differindex 18fb7d6e..1fa17d1b 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class Binary files differindex bf4c9607..6160ac92 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class Binary files differindex f32e67e1..09a58749 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class Binary files differindex fe0fb312..18262b01 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class Binary files differindex bf7e6a4b..7ea4ae26 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class Binary files differindex 58d74893..079b5cc7 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class Binary files differindex 435e35e6..a43e1d44 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class Binary files differindex 73313048..e12e6ef7 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class Binary files differindex 73a7236d..0d2560a4 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class Binary files differindex 484c3e3a..9dbdc9f6 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class Binary files differindex dce07a30..ac6c5c48 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class Binary files differindex b147a7f6..72130419 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class Binary files differindex 55ae7f14..a23e2786 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class Binary files differindex aa892ae8..3b5ca5e4 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncClient.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncClient.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class Binary files differindex 618c104e..047c7443 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncIface.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncIface.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class Binary files differindex 4159eeeb..738e5415 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class Binary files differindex 1595aec5..e23b322c 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class Binary files differindex 1d728d92..b8f976dd 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class Binary files differindex bc3594ef..eb272cc8 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class Binary files differindex fd477fa1..2cf81ba1 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class Binary files differindex a6740797..f832a80b 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class Binary files differindex 21a59c0c..32c05fd8 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class Binary files differindex aafdff74..8d57f1b7 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class Binary files differindex a0e1d112..d4ceb443 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class Binary files differindex 71ef8781..fa9a302d 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class Binary files differindex 16f1ffc4..cb596b31 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class Binary files differindex b3215722..56016353 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class Binary files differindex bf437eec..5a337eb9 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class Binary files differindex 0db6910c..cdd259e4 100644 --- a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class +++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class Binary files differindex 6c173026..21eb47eb 100644 --- a/Dozentenmodulserver/bin/server/Server$Client.class +++ b/Dozentenmodulserver/bin/server/Server$Client.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class Binary files differindex 39e8499a..f5119cc8 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class Binary files differindex 54c2d1f6..45cd420e 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class Binary files differindex a1d5e04c..466ae724 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class Binary files differindex 47c62ebd..dd615cd4 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class Binary files differindex b410af50..fd200c4e 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class Binary files differindex d84be6ff..9a10c13e 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class Binary files differindex 4c4c5a40..92dc5b4f 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class Binary files differindex 71f6ded2..6bde3cf7 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class Binary files differindex 798a3b95..482bcd2f 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class Binary files differindex 894de147..f8560d35 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class Binary files differindex d753608c..ca5460c5 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class Binary files differindex 3bcd8f22..703163e2 100644 --- a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class Binary files differindex 1837d582..f95adf52 100644 --- a/Dozentenmodulserver/bin/server/Server$Iface.class +++ b/Dozentenmodulserver/bin/server/Server$Iface.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class Binary files differindex 48b47bcb..4799479f 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class Binary files differindex ed4a20c6..5296ea7a 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class Binary files differindex 5c0a591a..2a8b0148 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class Binary files differindex a0d36444..1a73b881 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class Binary files differindex b48a72a0..d240b739 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class Binary files differindex f27ac24d..6bbed1a2 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class Binary files differindex a70e2f79..481fbeee 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class Binary files differindex 5952714a..cc5dd9fb 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class Binary files differindex 4daca316..117cbb08 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class Binary files differindex de196e41..78fd0954 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class Binary files differindex 2d255176..61ebaacd 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class Binary files differindex 94904d13..e3b9474b 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class Binary files differindex b7903340..8fcb63da 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class +++ b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class Binary files differindex c08a6168..e6dcbf15 100644 --- a/Dozentenmodulserver/bin/server/Server$Processor.class +++ b/Dozentenmodulserver/bin/server/Server$Processor.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class Binary files differindex 21093d85..c1684750 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class Binary files differindex 8e93068b..ce54f213 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class Binary files differindex aa0b733a..c6828e08 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class Binary files differindex fc8b405c..18bde437 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class Binary files differindex 1cae7954..40b630b4 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class Binary files differindex 8da8075c..a3360dfe 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class Binary files differindex ddc17ab4..f255ef55 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class Binary files differindex dec1e203..f2c960f0 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class Binary files differindex c2e48a88..967beab7 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class Binary files differindex 5e8bfdf0..a693108c 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class Binary files differindex 33894764..2578e105 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class Binary files differindex 7008fe45..0129e985 100644 --- a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class +++ b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class Binary files differindex 133eaf2f..03554da6 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class Binary files differindex 19d64556..b60b3eb0 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class Binary files differindex 647ce094..0e80eec5 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class Binary files differindex 7cc4753d..6f24f871 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class Binary files differindex 52781f0d..489ee69c 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class Binary files differindex 667e766b..9caa0a60 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class Binary files differindex fcb69540..fc5e838b 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class Binary files differindex 31b2f827..881358af 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class Binary files differindex eb2a3f50..3e3107a0 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class Binary files differindex e571f08d..779c256b 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class Binary files differindex 808bc35f..f7aee8e1 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class Binary files differindex 6ceec872..2837ef7f 100644 --- a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class +++ b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class Binary files differindex b0a5f9a8..a1faa5cb 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class Binary files differindex 81007ecd..f246d35e 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class Binary files differindex 7efc5321..27420451 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class Binary files differindex de8d9bf6..3223cc9d 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class Binary files differindex 4ee86b0b..22ee0862 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class Binary files differindex cfa48681..975cba41 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class Binary files differindex 0b6adc82..703ba8dc 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class Binary files differindex d7a42e50..99167e1e 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class Binary files differindex d41ca72b..cd44eab0 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class Binary files differindex c706fa06..06dedd3d 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class Binary files differindex 91b509b7..fb889bc2 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class Binary files differindex 1d56f747..e32f0176 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class Binary files differindex fa970d34..e0222ef1 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class Binary files differindex 420f6662..6eba1d71 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class Binary files differindex e2e31e84..abfd4bed 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class Binary files differindex a47ba0c1..bb274671 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class Binary files differindex f9c6a47f..cb514b97 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class Binary files differindex b981623d..8bb9a3cf 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_args.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class Binary files differindex a6960632..374792d6 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class Binary files differindex e523a270..2cc855ab 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class Binary files differindex 585c3c5d..3424cbb3 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class Binary files differindex 1ee79a13..84c86eb8 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class Binary files differindex 4c960c8a..a4326943 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class Binary files differindex 75ec6eca..325ba9ed 100644 --- a/Dozentenmodulserver/bin/server/Server$getImageList_result.class +++ b/Dozentenmodulserver/bin/server/Server$getImageList_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class Binary files differindex 32bcc7f8..c2fc0276 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class Binary files differindex b1b478b5..bc46d0b4 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class Binary files differindex 5311e009..1aa6bae7 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class Binary files differindex 24de0a5f..6af1c2d5 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class Binary files differindex 8baa2859..5c4317f5 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class Binary files differindex 0277f0b6..2aec57e6 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class Binary files differindex 454f3190..1a420161 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class Binary files differindex ed8b847a..69ee0cea 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class Binary files differindex e4f3afa3..681721cf 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class Binary files differindex 20eba92e..a16e2201 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class Binary files differindex c7b3d0c0..11c9d3d2 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class Binary files differindex 9eab985e..92a45d02 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class Binary files differindex fd4c260a..22bcc618 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class Binary files differindex 4d4ce310..c5edd8ab 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class Binary files differindex 3a92d45d..f08a824d 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class Binary files differindex 5c5d4cba..7e4ea3a6 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class Binary files differindex 23d08672..8d06a0e8 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class Binary files differindex 1c9f09b9..7506bd63 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class Binary files differindex 86f12f85..2698739b 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class Binary files differindex 0e074a2c..4e5eaec2 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class Binary files differindex 9290b6a1..33c40b8d 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class Binary files differindex cf3b1446..735f2fd7 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class Binary files differindex 2596ad18..e96b1739 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class Binary files differindex 897504b4..f16c05d0 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class Binary files differindex 85bf066c..73cab7a1 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class Binary files differindex 90b814a2..8deaf130 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class Binary files differindex 7c325e01..12074d17 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class Binary files differindex ba71f9b5..5fb2de31 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class Binary files differindex 5eed9b69..a7281f0f 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class Binary files differindex 1b900239..67b1de28 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class Binary files differindex fc15d911..77a6e6c3 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class Binary files differindex 75724b6a..53962979 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class Binary files differindex ff1b4b00..da59c1d0 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class Binary files differindex 5e057521..0d5479f9 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class Binary files differindex e3ba67cd..c79bdfdc 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class Binary files differindex e0f32b41..20359090 100644 --- a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class Binary files differindex 98d0d549..4787013d 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class Binary files differindex b7d64f1b..2481a5fb 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class Binary files differindex 70db0642..6e6cf517 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class Binary files differindex 1c83436d..9625bd56 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class Binary files differindex f232f735..24e753f5 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class Binary files differindex 639a9964..335fbb21 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class Binary files differindex ae1f71b7..4111aa57 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class Binary files differindex 47b6816f..ca4c6f2d 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class Binary files differindex 167d185b..1a16ee08 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class Binary files differindex a489e94b..69b4268f 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class Binary files differindex b926620e..cc51fcb1 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class Binary files differindex 6950dedb..d1987015 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class Binary files differindex 6014e713..c6910b20 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class Binary files differindex 3fca4332..b1602ad1 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class Binary files differindex 9b857801..d1302dd7 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class Binary files differindex 7b973a4b..6d46a74e 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class Binary files differindex 9879d5ea..45328d02 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class Binary files differindex 576ab908..d0f68324 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class Binary files differindex b440ee59..93cdb8ba 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class Binary files differindex 60ca10ae..1d1f1ce2 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class Binary files differindex 7cb49fa9..42b8fb5c 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class Binary files differindex 4d8e218e..270e231e 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class Binary files differindex ee2bdd03..d2e97cc3 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class Binary files differindex 027daa1e..58a469ca 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class Binary files differindex 44ede128..1dc597e4 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class Binary files differindex 3dbc1cab..24e20a3d 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class Binary files differindex 9c11ae10..510db4bb 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class Binary files differindex 8433786c..f1bfba09 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class Binary files differindex 036523d9..9077426f 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class Binary files differindex 55585aad..ed849746 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class Binary files differindex 48da3197..b1d19883 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class Binary files differindex c8d6f6d8..7251fc39 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class Binary files differindex 2c0d835b..d3003c9a 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class Binary files differindex 856716e2..a97214a4 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class Binary files differindex 1f6d9153..94d4ecfa 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class Binary files differindex 370cd6b8..6a27318e 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class Binary files differindex 6fb1b858..8a1ac863 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class Binary files differindex 87d4a5e9..6bcb3cec 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class Binary files differindex a744349a..6591a3fc 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class Binary files differindex bb0ee01d..412603bb 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class Binary files differindex 40d85701..9b378c34 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class Binary files differindex 5bc997e6..e5e88214 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class Binary files differindex 6d37e429..57e629d4 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class Binary files differindex bf5422f7..2e0d5003 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class Binary files differindex 00bd91f9..80dd36ee 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class Binary files differindex af87e6ee..97e4632d 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class Binary files differindex 3967ad41..bf2620bf 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class Binary files differindex e247dc0c..c3f9ba53 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class Binary files differindex d8e29fb4..806f9e32 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class Binary files differindex dc8fed9d..ba827fb9 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class Binary files differindex 717d5fda..5076c563 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class Binary files differindex 85f9f9eb..1404c2e0 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class Binary files differindex 6fad1772..8e125b36 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class Binary files differindex 864362f5..e9082858 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class Binary files differindex e3d115d9..e9c66269 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class Binary files differindex 526de41c..e02b06f7 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class Binary files differindex 464aff80..1e709219 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class Binary files differindex eec88c6f..a88955b0 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class Binary files differindex 449ca3a8..a5547532 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class Binary files differindex 519d493d..6c73aa49 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differindex 6f11b771..d0b004ab 100644 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ b/Dozentenmodulserver/bin/server/ServerHandler.class diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class Binary files differindex 0d223e85..3cea3ec6 100644 --- a/Dozentenmodulserver/bin/server/startServer.class +++ b/Dozentenmodulserver/bin/server/startServer.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex 83234945..46fc24af 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex 59247610..cfdf6004 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar b/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar Binary files differnew file mode 100644 index 00000000..6f6877c5 --- /dev/null +++ b/Dozentenmodulserver/lib/ini4j-0.5.2-SNAPSHOT.jar diff --git a/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar b/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar Binary files differnew file mode 100644 index 00000000..9dece319 --- /dev/null +++ b/Dozentenmodulserver/lib/slf4j-simple-1.7.5.jar diff --git a/Dozentenmodulserver/src/models/Configuration.java b/Dozentenmodulserver/src/models/Configuration.java new file mode 100644 index 00000000..1e616466 --- /dev/null +++ b/Dozentenmodulserver/src/models/Configuration.java @@ -0,0 +1,39 @@ +package models; + +public class Configuration { + + private String absolute_path; + private String sql_connection; + private String sql_user; + private String sql_pass; + + public static Configuration config =new Configuration(); + + public String getAbsolute_path() { + return absolute_path; + } + public void setAbsolute_path(String absolute_path) { + this.absolute_path = absolute_path; + } + public String getSql_connection() { + return sql_connection; + } + public void setSql_connection(String sql_connection) { + this.sql_connection = sql_connection; + } + public String getSql_user() { + return sql_user; + } + public void setSql_user(String sql_user) { + this.sql_user = sql_user; + } + public String getSql_pass() { + return sql_pass; + } + public void setSql_pass(String sql_pass) { + this.sql_pass = sql_pass; + } + + + +} diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index a6dd4496..acf92a89 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -38,6 +38,7 @@ public class BinaryListener implements Runnable log.info(new Date() +" - Started running BinaryListener"); server.serve(); + } - + } diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 88003fa2..ef434865 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException; public List<Image> getImageList() throws org.apache.thrift.TException; @@ -58,7 +58,7 @@ public class Server { public Map<String,String> getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException; public Map<String,String> getLectureData(String lecturename) throws org.apache.thrift.TException; @@ -70,7 +70,7 @@ public class Server { public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException; - public boolean deleteLecture(String id) throws org.apache.thrift.TException; + public boolean deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException; } @@ -82,7 +82,7 @@ public class Server { public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -98,7 +98,7 @@ public class Server { public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -110,7 +110,7 @@ public class Server { public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void deleteLecture(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteLecture(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -203,13 +203,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException { - send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); + send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); @@ -225,6 +225,8 @@ public class Server { args.setRam(ram); args.setCpu(cpu); args.setImagePath(imagePath); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); sendBase("writeVLdata", args); } @@ -411,23 +413,26 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException { - send_updateImageData(name, newName, license, internet, ram, cpu, id, version); + send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); args.setId(id); args.setVersion(version); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); sendBase("updateImageData", args); } @@ -573,16 +578,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "connectedToLecture failed: unknown result"); } - public boolean deleteLecture(String id) throws org.apache.thrift.TException + public boolean deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException { - send_deleteLecture(id); + send_deleteLecture(id, hs, user); return recv_deleteLecture(); } - public void send_deleteLecture(String id) throws org.apache.thrift.TException + public void send_deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException { deleteLecture_args args = new deleteLecture_args(); args.setId(id); + args.setHs(hs); + args.setUser(user); sendBase("deleteLecture", args); } @@ -710,9 +717,9 @@ public class Server { } } - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -731,7 +738,9 @@ public class Server { private long ram; private long cpu; private String imagePath; - public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private boolean isTemplate; + private long filesize; + public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; this.login = login; @@ -746,6 +755,8 @@ public class Server { this.ram = ram; this.cpu = cpu; this.imagePath = imagePath; + this.isTemplate = isTemplate; + this.filesize = filesize; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -764,6 +775,8 @@ public class Server { args.setRam(ram); args.setCpu(cpu); args.setImagePath(imagePath); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); args.write(prot); prot.writeMessageEnd(); } @@ -1038,9 +1051,9 @@ public class Server { } } - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1048,22 +1061,28 @@ public class Server { public static class updateImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String newName; + private String image_path; private boolean license; private boolean internet; private long ram; private long cpu; private String id; private String version; - public updateImageData_call(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private boolean isTemplate; + private long filesize; + public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; this.internet = internet; this.ram = ram; this.cpu = cpu; this.id = id; this.version = version; + this.isTemplate = isTemplate; + this.filesize = filesize; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -1071,12 +1090,15 @@ public class Server { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); args.setCpu(cpu); args.setId(id); args.setVersion(version); + args.setIsTemplate(isTemplate); + args.setFilesize(filesize); args.write(prot); prot.writeMessageEnd(); } @@ -1302,24 +1324,30 @@ public class Server { } } - public void deleteLecture(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteLecture(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - deleteLecture_call method_call = new deleteLecture_call(id, resultHandler, this, ___protocolFactory, ___transport); + deleteLecture_call method_call = new deleteLecture_call(id, hs, user, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall { private String id; - public deleteLecture_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private String hs; + private String user; + public deleteLecture_call(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; + this.hs = hs; + this.user = user; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteLecture", org.apache.thrift.protocol.TMessageType.CALL, 0)); deleteLecture_args args = new deleteLecture_args(); args.setId(id); + args.setHs(hs); + args.setUser(user); args.write(prot); prot.writeMessageEnd(); } @@ -1444,7 +1472,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath); + result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize); result.setSuccessIsSet(true); return result; } @@ -1607,7 +1635,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version); + result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize); result.setSuccessIsSet(true); return result; } @@ -1732,7 +1760,7 @@ public class Server { public deleteLecture_result getResult(I iface, deleteLecture_args args) throws org.apache.thrift.TException { deleteLecture_result result = new deleteLecture_result(); - result.success = iface.deleteLecture(args.id); + result.success = iface.deleteLecture(args.id, args.hs, args.user); result.setSuccessIsSet(true); return result; } @@ -1974,7 +2002,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath,resultHandler); + iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize,resultHandler); } } @@ -2385,7 +2413,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); + iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize,resultHandler); } } @@ -2696,7 +2724,7 @@ public class Server { } public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.deleteLecture(args.id,resultHandler); + iface.deleteLecture(args.id, args.hs, args.user,resultHandler); } } @@ -4839,6 +4867,8 @@ public class Server { private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-11); private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-12); private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-13); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-14); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-15); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4859,6 +4889,8 @@ public class Server { public long ram; // required public long cpu; // required public String imagePath; // required + public boolean isTemplate; // required + public long filesize; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -4874,7 +4906,9 @@ public class Server { INTERNET((short)-10, "internet"), RAM((short)-11, "ram"), CPU((short)-12, "cpu"), - IMAGE_PATH((short)-13, "imagePath"); + IMAGE_PATH((short)-13, "imagePath"), + IS_TEMPLATE((short)-14, "isTemplate"), + FILESIZE((short)-15, "filesize"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4915,6 +4949,10 @@ public class Server { return CPU; case -13: // IMAGE_PATH return IMAGE_PATH; + case -14: // IS_TEMPLATE + return IS_TEMPLATE; + case -15: // FILESIZE + return FILESIZE; default: return null; } @@ -4959,6 +4997,8 @@ public class Server { private static final int __INTERNET_ISSET_ID = 1; private static final int __RAM_ISSET_ID = 2; private static final int __CPU_ISSET_ID = 3; + private static final int __ISTEMPLATE_ISSET_ID = 4; + private static final int __FILESIZE_ISSET_ID = 5; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -4989,6 +5029,10 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64 , "int"))); tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("imagePath", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IS_TEMPLATE, new org.apache.thrift.meta_data.FieldMetaData("isTemplate", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeVLdata_args.class, metaDataMap); } @@ -5009,7 +5053,9 @@ public class Server { boolean internet, long ram, long cpu, - String imagePath) + String imagePath, + boolean isTemplate, + long filesize) { this(); this.imagename = imagename; @@ -5029,6 +5075,10 @@ public class Server { this.cpu = cpu; setCpuIsSet(true); this.imagePath = imagePath; + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + this.filesize = filesize; + setFilesizeIsSet(true); } /** @@ -5067,6 +5117,8 @@ public class Server { if (other.isSetImagePath()) { this.imagePath = other.imagePath; } + this.isTemplate = other.isTemplate; + this.filesize = other.filesize; } public writeVLdata_args deepCopy() { @@ -5092,6 +5144,10 @@ public class Server { setCpuIsSet(false); this.cpu = 0; this.imagePath = null; + setIsTemplateIsSet(false); + this.isTemplate = false; + setFilesizeIsSet(false); + this.filesize = 0; } public String getImagename() { @@ -5402,6 +5458,52 @@ public class Server { } } + public boolean isIsTemplate() { + return this.isTemplate; + } + + public writeVLdata_args setIsTemplate(boolean isTemplate) { + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + return this; + } + + public void unsetIsTemplate() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */ + public boolean isSetIsTemplate() { + return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + public void setIsTemplateIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value); + } + + public long getFilesize() { + return this.filesize; + } + + public writeVLdata_args setFilesize(long filesize) { + this.filesize = filesize; + setFilesizeIsSet(true); + return this; + } + + public void unsetFilesize() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + /** Returns true if field filesize is set (has been assigned a value) and false otherwise */ + public boolean isSetFilesize() { + return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + public void setFilesizeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case IMAGENAME: @@ -5508,6 +5610,22 @@ public class Server { } break; + case IS_TEMPLATE: + if (value == null) { + unsetIsTemplate(); + } else { + setIsTemplate((Boolean)value); + } + break; + + case FILESIZE: + if (value == null) { + unsetFilesize(); + } else { + setFilesize((Long)value); + } + break; + } } @@ -5552,6 +5670,12 @@ public class Server { case IMAGE_PATH: return getImagePath(); + case IS_TEMPLATE: + return Boolean.valueOf(isIsTemplate()); + + case FILESIZE: + return Long.valueOf(getFilesize()); + } throw new IllegalStateException(); } @@ -5589,6 +5713,10 @@ public class Server { return isSetCpu(); case IMAGE_PATH: return isSetImagePath(); + case IS_TEMPLATE: + return isSetIsTemplate(); + case FILESIZE: + return isSetFilesize(); } throw new IllegalStateException(); } @@ -5723,6 +5851,24 @@ public class Server { return false; } + boolean this_present_isTemplate = true; + boolean that_present_isTemplate = true; + if (this_present_isTemplate || that_present_isTemplate) { + if (!(this_present_isTemplate && that_present_isTemplate)) + return false; + if (this.isTemplate != that.isTemplate) + return false; + } + + boolean this_present_filesize = true; + boolean that_present_filesize = true; + if (this_present_filesize || that_present_filesize) { + if (!(this_present_filesize && that_present_filesize)) + return false; + if (this.filesize != that.filesize) + return false; + } + return true; } @@ -5869,6 +6015,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsTemplate()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isTemplate, other.isTemplate); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFilesize()).compareTo(other.isSetFilesize()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFilesize()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filesize, other.filesize); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -5976,6 +6142,14 @@ public class Server { sb.append(this.imagePath); } first = false; + if (!first) sb.append(", "); + sb.append("isTemplate:"); + sb.append(this.isTemplate); + first = false; + if (!first) sb.append(", "); + sb.append("filesize:"); + sb.append(this.filesize); + first = false; sb.append(")"); return sb.toString(); } @@ -6125,6 +6299,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -14: // IS_TEMPLATE + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -15: // FILESIZE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -6140,6 +6330,12 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); if (struct.imagePath != null) { oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); oprot.writeString(struct.imagePath); @@ -6254,7 +6450,13 @@ public class Server { if (struct.isSetImagePath()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetIsTemplate()) { + optionals.set(13); + } + if (struct.isSetFilesize()) { + optionals.set(14); + } + oprot.writeBitSet(optionals, 15); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } @@ -6294,12 +6496,18 @@ public class Server { if (struct.isSetImagePath()) { oprot.writeString(struct.imagePath); } + if (struct.isSetIsTemplate()) { + oprot.writeBool(struct.isTemplate); + } + if (struct.isSetFilesize()) { + oprot.writeI64(struct.filesize); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(13); + BitSet incoming = iprot.readBitSet(15); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); @@ -6352,6 +6560,14 @@ public class Server { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); } + if (incoming.get(13)) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } + if (incoming.get(14)) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } } } @@ -13107,12 +13323,15 @@ public class Server { private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-3); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-4); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-5); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-6); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-4); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-5); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-6); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-7); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-10); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-11); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -13122,23 +13341,29 @@ public class Server { public String name; // required public String newName; // required + public String image_path; // required public boolean license; // required public boolean internet; // required public long ram; // required public long cpu; // required public String id; // required public String version; // required + public boolean isTemplate; // required + public long filesize; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)-1, "name"), NEW_NAME((short)-2, "newName"), - LICENSE((short)-3, "license"), - INTERNET((short)-4, "internet"), - RAM((short)-5, "ram"), - CPU((short)-6, "cpu"), - ID((short)-7, "id"), - VERSION((short)-8, "version"); + IMAGE_PATH((short)-3, "image_path"), + LICENSE((short)-4, "license"), + INTERNET((short)-5, "internet"), + RAM((short)-6, "ram"), + CPU((short)-7, "cpu"), + ID((short)-8, "id"), + VERSION((short)-9, "version"), + IS_TEMPLATE((short)-10, "isTemplate"), + FILESIZE((short)-11, "filesize"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -13157,18 +13382,24 @@ public class Server { return NAME; case -2: // NEW_NAME return NEW_NAME; - case -3: // LICENSE + case -3: // IMAGE_PATH + return IMAGE_PATH; + case -4: // LICENSE return LICENSE; - case -4: // INTERNET + case -5: // INTERNET return INTERNET; - case -5: // RAM + case -6: // RAM return RAM; - case -6: // CPU + case -7: // CPU return CPU; - case -7: // ID + case -8: // ID return ID; - case -8: // VERSION + case -9: // VERSION return VERSION; + case -10: // IS_TEMPLATE + return IS_TEMPLATE; + case -11: // FILESIZE + return FILESIZE; default: return null; } @@ -13213,6 +13444,8 @@ public class Server { private static final int __INTERNET_ISSET_ID = 1; private static final int __RAM_ISSET_ID = 2; private static final int __CPU_ISSET_ID = 3; + private static final int __ISTEMPLATE_ISSET_ID = 4; + private static final int __FILESIZE_ISSET_ID = 5; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -13221,6 +13454,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NEW_NAME, new org.apache.thrift.meta_data.FieldMetaData("newName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("image_path", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LICENSE, new org.apache.thrift.meta_data.FieldMetaData("license", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.INTERNET, new org.apache.thrift.meta_data.FieldMetaData("internet", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -13233,6 +13468,10 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IS_TEMPLATE, new org.apache.thrift.meta_data.FieldMetaData("isTemplate", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.FILESIZE, new org.apache.thrift.meta_data.FieldMetaData("filesize", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageData_args.class, metaDataMap); } @@ -13243,16 +13482,20 @@ public class Server { public updateImageData_args( String name, String newName, + String image_path, boolean license, boolean internet, long ram, long cpu, String id, - String version) + String version, + boolean isTemplate, + long filesize) { this(); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; setLicenseIsSet(true); this.internet = internet; @@ -13263,6 +13506,10 @@ public class Server { setCpuIsSet(true); this.id = id; this.version = version; + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + this.filesize = filesize; + setFilesizeIsSet(true); } /** @@ -13276,6 +13523,9 @@ public class Server { if (other.isSetNewName()) { this.newName = other.newName; } + if (other.isSetImage_path()) { + this.image_path = other.image_path; + } this.license = other.license; this.internet = other.internet; this.ram = other.ram; @@ -13286,6 +13536,8 @@ public class Server { if (other.isSetVersion()) { this.version = other.version; } + this.isTemplate = other.isTemplate; + this.filesize = other.filesize; } public updateImageData_args deepCopy() { @@ -13296,6 +13548,7 @@ public class Server { public void clear() { this.name = null; this.newName = null; + this.image_path = null; setLicenseIsSet(false); this.license = false; setInternetIsSet(false); @@ -13306,6 +13559,10 @@ public class Server { this.cpu = 0; this.id = null; this.version = null; + setIsTemplateIsSet(false); + this.isTemplate = false; + setFilesizeIsSet(false); + this.filesize = 0; } public String getName() { @@ -13356,6 +13613,30 @@ public class Server { } } + public String getImage_path() { + return this.image_path; + } + + public updateImageData_args setImage_path(String image_path) { + this.image_path = image_path; + return this; + } + + public void unsetImage_path() { + this.image_path = null; + } + + /** Returns true if field image_path is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_path() { + return this.image_path != null; + } + + public void setImage_pathIsSet(boolean value) { + if (!value) { + this.image_path = null; + } + } + public boolean isLicense() { return this.license; } @@ -13496,6 +13777,52 @@ public class Server { } } + public boolean isIsTemplate() { + return this.isTemplate; + } + + public updateImageData_args setIsTemplate(boolean isTemplate) { + this.isTemplate = isTemplate; + setIsTemplateIsSet(true); + return this; + } + + public void unsetIsTemplate() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */ + public boolean isSetIsTemplate() { + return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID); + } + + public void setIsTemplateIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value); + } + + public long getFilesize() { + return this.filesize; + } + + public updateImageData_args setFilesize(long filesize) { + this.filesize = filesize; + setFilesizeIsSet(true); + return this; + } + + public void unsetFilesize() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + /** Returns true if field filesize is set (has been assigned a value) and false otherwise */ + public boolean isSetFilesize() { + return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID); + } + + public void setFilesizeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAME: @@ -13514,6 +13841,14 @@ public class Server { } break; + case IMAGE_PATH: + if (value == null) { + unsetImage_path(); + } else { + setImage_path((String)value); + } + break; + case LICENSE: if (value == null) { unsetLicense(); @@ -13562,6 +13897,22 @@ public class Server { } break; + case IS_TEMPLATE: + if (value == null) { + unsetIsTemplate(); + } else { + setIsTemplate((Boolean)value); + } + break; + + case FILESIZE: + if (value == null) { + unsetFilesize(); + } else { + setFilesize((Long)value); + } + break; + } } @@ -13573,6 +13924,9 @@ public class Server { case NEW_NAME: return getNewName(); + case IMAGE_PATH: + return getImage_path(); + case LICENSE: return Boolean.valueOf(isLicense()); @@ -13591,6 +13945,12 @@ public class Server { case VERSION: return getVersion(); + case IS_TEMPLATE: + return Boolean.valueOf(isIsTemplate()); + + case FILESIZE: + return Long.valueOf(getFilesize()); + } throw new IllegalStateException(); } @@ -13606,6 +13966,8 @@ public class Server { return isSetName(); case NEW_NAME: return isSetNewName(); + case IMAGE_PATH: + return isSetImage_path(); case LICENSE: return isSetLicense(); case INTERNET: @@ -13618,6 +13980,10 @@ public class Server { return isSetId(); case VERSION: return isSetVersion(); + case IS_TEMPLATE: + return isSetIsTemplate(); + case FILESIZE: + return isSetFilesize(); } throw new IllegalStateException(); } @@ -13653,6 +14019,15 @@ public class Server { return false; } + boolean this_present_image_path = true && this.isSetImage_path(); + boolean that_present_image_path = true && that.isSetImage_path(); + if (this_present_image_path || that_present_image_path) { + if (!(this_present_image_path && that_present_image_path)) + return false; + if (!this.image_path.equals(that.image_path)) + return false; + } + boolean this_present_license = true; boolean that_present_license = true; if (this_present_license || that_present_license) { @@ -13707,6 +14082,24 @@ public class Server { return false; } + boolean this_present_isTemplate = true; + boolean that_present_isTemplate = true; + if (this_present_isTemplate || that_present_isTemplate) { + if (!(this_present_isTemplate && that_present_isTemplate)) + return false; + if (this.isTemplate != that.isTemplate) + return false; + } + + boolean this_present_filesize = true; + boolean that_present_filesize = true; + if (this_present_filesize || that_present_filesize) { + if (!(this_present_filesize && that_present_filesize)) + return false; + if (this.filesize != that.filesize) + return false; + } + return true; } @@ -13743,6 +14136,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetImage_path()).compareTo(other.isSetImage_path()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImage_path()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_path, other.image_path); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetLicense()).compareTo(other.isSetLicense()); if (lastComparison != 0) { return lastComparison; @@ -13803,6 +14206,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIsTemplate()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isTemplate, other.isTemplate); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetFilesize()).compareTo(other.isSetFilesize()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFilesize()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filesize, other.filesize); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -13839,6 +14262,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("image_path:"); + if (this.image_path == null) { + sb.append("null"); + } else { + sb.append(this.image_path); + } + first = false; + if (!first) sb.append(", "); sb.append("license:"); sb.append(this.license); first = false; @@ -13870,6 +14301,14 @@ public class Server { sb.append(this.version); } first = false; + if (!first) sb.append(", "); + sb.append("isTemplate:"); + sb.append(this.isTemplate); + first = false; + if (!first) sb.append(", "); + sb.append("filesize:"); + sb.append(this.filesize); + first = false; sb.append(")"); return sb.toString(); } @@ -13931,7 +14370,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LICENSE + case -3: // IMAGE_PATH + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -4: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -13939,7 +14386,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // INTERNET + case -5: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -13947,7 +14394,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // RAM + case -6: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -13955,7 +14402,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // CPU + case -7: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -13963,7 +14410,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // ID + case -8: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -13971,7 +14418,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // VERSION + case -9: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -13979,6 +14426,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -10: // IS_TEMPLATE + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -11: // FILESIZE + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -13994,6 +14457,12 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(FILESIZE_FIELD_DESC); + oprot.writeI64(struct.filesize); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC); + oprot.writeBool(struct.isTemplate); + oprot.writeFieldEnd(); if (struct.version != null) { oprot.writeFieldBegin(VERSION_FIELD_DESC); oprot.writeString(struct.version); @@ -14016,6 +14485,11 @@ public class Server { oprot.writeFieldBegin(LICENSE_FIELD_DESC); oprot.writeBool(struct.license); oprot.writeFieldEnd(); + if (struct.image_path != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.image_path); + oprot.writeFieldEnd(); + } if (struct.newName != null) { oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); oprot.writeString(struct.newName); @@ -14050,31 +14524,43 @@ public class Server { if (struct.isSetNewName()) { optionals.set(1); } - if (struct.isSetLicense()) { + if (struct.isSetImage_path()) { optionals.set(2); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(3); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(4); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(5); } - if (struct.isSetId()) { + if (struct.isSetCpu()) { optionals.set(6); } - if (struct.isSetVersion()) { + if (struct.isSetId()) { optionals.set(7); } - oprot.writeBitSet(optionals, 8); + if (struct.isSetVersion()) { + optionals.set(8); + } + if (struct.isSetIsTemplate()) { + optionals.set(9); + } + if (struct.isSetFilesize()) { + optionals.set(10); + } + oprot.writeBitSet(optionals, 11); if (struct.isSetName()) { oprot.writeString(struct.name); } if (struct.isSetNewName()) { oprot.writeString(struct.newName); } + if (struct.isSetImage_path()) { + oprot.writeString(struct.image_path); + } if (struct.isSetLicense()) { oprot.writeBool(struct.license); } @@ -14093,12 +14579,18 @@ public class Server { if (struct.isSetVersion()) { oprot.writeString(struct.version); } + if (struct.isSetIsTemplate()) { + oprot.writeBool(struct.isTemplate); + } + if (struct.isSetFilesize()) { + oprot.writeI64(struct.filesize); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(8); + BitSet incoming = iprot.readBitSet(11); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -14108,29 +14600,41 @@ public class Server { struct.setNewNameIsSet(true); } if (incoming.get(2)) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } + if (incoming.get(3)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.version = iprot.readString(); struct.setVersionIsSet(true); } + if (incoming.get(9)) { + struct.isTemplate = iprot.readBool(); + struct.setIsTemplateIsSet(true); + } + if (incoming.get(10)) { + struct.filesize = iprot.readI64(); + struct.setFilesizeIsSet(true); + } } } @@ -19784,6 +20288,8 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteLecture_args"); private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-1); + private static final org.apache.thrift.protocol.TField HS_FIELD_DESC = new org.apache.thrift.protocol.TField("hs", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)-3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -19792,10 +20298,14 @@ public class Server { } public String id; // required + public String hs; // required + public String user; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - ID((short)-1, "id"); + ID((short)-1, "id"), + HS((short)-2, "hs"), + USER((short)-3, "user"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -19812,6 +20322,10 @@ public class Server { switch(fieldId) { case -1: // ID return ID; + case -2: // HS + return HS; + case -3: // USER + return USER; default: return null; } @@ -19857,6 +20371,10 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.HS, new org.apache.thrift.meta_data.FieldMetaData("hs", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_args.class, metaDataMap); } @@ -19865,10 +20383,14 @@ public class Server { } public deleteLecture_args( - String id) + String id, + String hs, + String user) { this(); this.id = id; + this.hs = hs; + this.user = user; } /** @@ -19878,6 +20400,12 @@ public class Server { if (other.isSetId()) { this.id = other.id; } + if (other.isSetHs()) { + this.hs = other.hs; + } + if (other.isSetUser()) { + this.user = other.user; + } } public deleteLecture_args deepCopy() { @@ -19887,6 +20415,8 @@ public class Server { @Override public void clear() { this.id = null; + this.hs = null; + this.user = null; } public String getId() { @@ -19913,6 +20443,54 @@ public class Server { } } + public String getHs() { + return this.hs; + } + + public deleteLecture_args setHs(String hs) { + this.hs = hs; + return this; + } + + public void unsetHs() { + this.hs = null; + } + + /** Returns true if field hs is set (has been assigned a value) and false otherwise */ + public boolean isSetHs() { + return this.hs != null; + } + + public void setHsIsSet(boolean value) { + if (!value) { + this.hs = null; + } + } + + public String getUser() { + return this.user; + } + + public deleteLecture_args setUser(String user) { + this.user = user; + return this; + } + + public void unsetUser() { + this.user = null; + } + + /** Returns true if field user is set (has been assigned a value) and false otherwise */ + public boolean isSetUser() { + return this.user != null; + } + + public void setUserIsSet(boolean value) { + if (!value) { + this.user = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ID: @@ -19923,6 +20501,22 @@ public class Server { } break; + case HS: + if (value == null) { + unsetHs(); + } else { + setHs((String)value); + } + break; + + case USER: + if (value == null) { + unsetUser(); + } else { + setUser((String)value); + } + break; + } } @@ -19931,6 +20525,12 @@ public class Server { case ID: return getId(); + case HS: + return getHs(); + + case USER: + return getUser(); + } throw new IllegalStateException(); } @@ -19944,6 +20544,10 @@ public class Server { switch (field) { case ID: return isSetId(); + case HS: + return isSetHs(); + case USER: + return isSetUser(); } throw new IllegalStateException(); } @@ -19970,6 +20574,24 @@ public class Server { return false; } + boolean this_present_hs = true && this.isSetHs(); + boolean that_present_hs = true && that.isSetHs(); + if (this_present_hs || that_present_hs) { + if (!(this_present_hs && that_present_hs)) + return false; + if (!this.hs.equals(that.hs)) + return false; + } + + boolean this_present_user = true && this.isSetUser(); + boolean that_present_user = true && that.isSetUser(); + if (this_present_user || that_present_user) { + if (!(this_present_user && that_present_user)) + return false; + if (!this.user.equals(that.user)) + return false; + } + return true; } @@ -19996,6 +20618,26 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetHs()).compareTo(other.isSetHs()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetHs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hs, other.hs); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUser()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -20023,6 +20665,22 @@ public class Server { sb.append(this.id); } first = false; + if (!first) sb.append(", "); + sb.append("hs:"); + if (this.hs == null) { + sb.append("null"); + } else { + sb.append(this.hs); + } + first = false; + if (!first) sb.append(", "); + sb.append("user:"); + if (this.user == null) { + sb.append("null"); + } else { + sb.append(this.user); + } + first = false; sb.append(")"); return sb.toString(); } @@ -20074,6 +20732,22 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case -2: // HS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.hs = iprot.readString(); + struct.setHsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -3: // USER + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.user = iprot.readString(); + struct.setUserIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -20089,6 +20763,16 @@ public class Server { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.user != null) { + oprot.writeFieldBegin(USER_FIELD_DESC); + oprot.writeString(struct.user); + oprot.writeFieldEnd(); + } + if (struct.hs != null) { + oprot.writeFieldBegin(HS_FIELD_DESC); + oprot.writeString(struct.hs); + oprot.writeFieldEnd(); + } if (struct.id != null) { oprot.writeFieldBegin(ID_FIELD_DESC); oprot.writeString(struct.id); @@ -20115,20 +20799,40 @@ public class Server { if (struct.isSetId()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetHs()) { + optionals.set(1); + } + if (struct.isSetUser()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetId()) { oprot.writeString(struct.id); } + if (struct.isSetHs()) { + oprot.writeString(struct.hs); + } + if (struct.isSetUser()) { + oprot.writeString(struct.user); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } + if (incoming.get(1)) { + struct.hs = iprot.readString(); + struct.setHsIsSet(true); + } + if (incoming.get(2)) { + struct.user = iprot.readString(); + struct.setUserIsSet(true); + } } } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 63970d34..dad9b1a8 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -3,64 +3,95 @@ package server; import java.io.File; import java.io.IOException; import java.math.BigInteger; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.sql.Connection; -import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; - +import models.Configuration; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; import org.apache.thrift.TException; - import sql.SQL; import util.XMLCreator; public class ServerHandler implements Server.Iface { - static SQL sql = new SQL(); - static Connection con = sql.getConnection(); - private static Logger log = Logger.getLogger(ServerHandler.class); - /** - * @param args - */ - /* - * public static void main(String[] args) { // TODO Auto-generated method - * stub - * - * } - */ + private static Logger log = Logger.getLogger(ServerHandler.class); @Override public User getFtpUser() throws TException { - log.info(new Date() + " - returing FTPUser..."); + log.info(new Date() + " - returning FTPUser..."); User user = new User(); user.setUserName(UUID.randomUUID().toString().substring(0, 8)); user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString() .substring(0, 8))); - user.setPath("/srv/openslx/nfs/temp"); - SQL sql = new SQL(); - Connection con = sql.getConnection(); - sql.writeFTPUser(con, user.getUserName(), user.getPassword()); - log.info(new Date() + " - successfully returned FTPUser"); - return user; + if (Configuration.config.getAbsolute_path().endsWith("/")) { + user.setPath(Configuration.config.getAbsolute_path()); + } else { + user.setPath(Configuration.config.getAbsolute_path() + "/"); + } + + // check if folder temp exists + if (folderTempExists() == true) { + sql.writeFTPUser(user.getUserName(), user.getPassword()); + return user; + } else { + log.info(new Date() + " - returning null user"); + return null; + } } + public boolean folderTempExists() { + // check if folder temp exists, otherwise create it + Path path = null; + if (Configuration.config.getAbsolute_path().endsWith("/")) { + path = Paths.get(Configuration.config.getAbsolute_path() + "temp"); + } else { + path = Paths.get(Configuration.config.getAbsolute_path() + "/temp"); + } + + if (Files.exists(path) == true) { + log.info(new Date() + " - folder '" + path + + "' exists, no further action"); + return true; + } else { + // create directory and set permissions + boolean success = (new File(path + "")).mkdirs(); + + if (!success) { + log.info(new Date() + " - failed to create folder '" + path + + "'"); + return false; + } else { + // set permissions + try { + Runtime.getRuntime().exec("chmod 777 " + path); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + log.info(new Date() + " - folder '" + path + + "' successfully created"); + return true; + } + } + + }// end folderTempExists() + public String getEncodedSha1Sum(String key) { try { - log.info(new Date() + " - returned EncodedSha1Sum..."); MessageDigest md = MessageDigest.getInstance("SHA1"); md.update(key.getBytes()); log.info(new Date() + " - successfully returned EncodedSha1Sum"); @@ -73,157 +104,80 @@ public class ServerHandler implements Server.Iface { @Override public long DeleteFtpUser(String user) throws TException { - int ret = sql.DeleteUser(con, user); - log.info(new Date() + " - deleting FTPUser"); - return ret; + return sql.DeleteUser(user); } @Override public String getPathOfImage(String image_id, String version) throws TException { + log.info(new Date() + " - successfully returned PathOfImage: " + + sql.getPathOfImage(image_id, version)); + return sql.getPathOfImage(image_id, version); - try { - log.info(new Date() + " - returning PathOfImage..."); - ResultSet rs = sql.getPathOfImage(con, image_id, version); - System.out.println("Path SQL erfolgreich"); - rs.next(); - System.out.println(rs.getString("image_path")); - log.info(new Date() + " - successfully returned PathOfImage: " - + rs.getString("image_path")); - return rs.getString("image_path"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning PathOfImage: null"); - return null; } @Override - public boolean writeVLdata(String imagename, String login ,String firstname, - String lastname, String university, String Mail, String Tel, - String Fak, boolean license, boolean internet, long ram, long cpu, - String imagePath) throws TException { - + public boolean writeVLdata(String imagename, String login, + String firstname, String lastname, String university, String Mail, + String Tel, String Fak, boolean license, boolean internet, + long ram, long cpu, String imagePath, boolean isTemplate, + long filesize) throws TException { - int pk_institution = sql.setInstitution(con, university); + String pk_institution = sql.setInstitution(university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution); - sql.setImageData(con, pk_person, license, internet, cpu, ram, - imagename, imagePath); + sql.setImageData(pk_person, license, internet, cpu, ram, imagename, + imagePath, isTemplate, filesize); - log.info(new Date() + " - writing VLdata"); + log.info(new Date() + " - written VLdata"); // TODO Auto-generated method stub return true; } @Override public List<Image> getImageList() throws TException { - ResultSet res = sql.getImageList(con); - - List<Image> list = new ArrayList<Image>(); - - try { - - while (res.next()) { - - list.add(new Image(res.getString("GUID_imageID"), res - .getString("imageVersion"), - res.getString("image_name"), res - .getString("cond_hasLicenseRestriction"), res - .getString("name"), res.getString("lecture"), - res.getString("image_update_time"), res - .getString("user"))); + return sql.getImageList(); - } - - log.info(new Date() + " - returning ImageList: " + list.size()); - return list; - } catch (SQLException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - log.info(new Date() + " - returning ImageList: " + list.size()); - return null; } @Override public List<String> getAllOS() throws TException { - List<String> list = new ArrayList<>(); - ResultSet rs = sql.getAllOS(con); - try { - while (rs.next()) { - list.add(rs.getString("name")); - } - log.info(new Date() + " - returning AllOS: " + list.size()); - return list; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning AllOS: " + list.size()); - return null; + return sql.getAllOS(); + } @Override public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException { - Map<String, String> map = new HashMap<String, String>(); + return sql.getPersonData(Vorname, Nachname); - ResultSet rs = sql.getPersonData(con, Vorname, Nachname); - try { - while (rs.next()) { - - map.put("mail", rs.getString("mail")); - map.put("Nachname", rs.getString("Nachname")); - map.put("Vorname", rs.getString("Vorname")); - map.put("Hochschule", rs.getString("name")); - - } - log.info(new Date() + " - returning PersonData: " + map.size()); - return map; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning PersonData: " + map.size()); - return null; } @Override public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, - String imagename, String login ,String firstname, String lastname, + String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws TException { - int pk_image = 0; - + String pk_image = null; + Map<String, String> map = new HashMap<String, String>(); int imageversion = 0; - int pk_institution = sql.setInstitution(con, university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_institution = sql.setInstitution(university); + String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution); - ResultSet image = sql.getImageIDandVersion(con, imagename); + map = sql.getImageIDandVersion(imagename); - try { - while (image.next()) { - pk_image = image.getInt("GUID_imageID"); - imageversion = image.getInt("imageVersion"); - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - System.out.println(startDate); - sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, + pk_image = map.get("GUID"); + imageversion = Integer.parseInt(map.get("version")); + sql.setLectureData(pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive); - XMLCreator xml = new XMLCreator(con, name); + XMLCreator xml = new XMLCreator(sql.getConnection(), name); try { xml.create(name); - log.info(new Date() + " - XML created"); + log.info(new Date() + " - XML created."); } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -238,27 +192,27 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean startFileCopy(String file) throws TException { + public boolean startFileCopy(String filename) throws TException { + //copy file from folder temp to folder prod + String file = Configuration.config.getAbsolute_path() + "temp/" + + filename; File tmpFile = new File(file); - System.out.println("Vor Move" + new Date()); + log.info(new Date() + + " - Trying to move file to '/srv/openslx/nfs/prod/" + + tmpFile.getName() + "'"); try { - - //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? - FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); - - //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen? - FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName())); - - // der übergebene Filename ist falsch - hier muss der generierte - // name geholt werden, nicht der ursprüngliche name. wo wird dieser - // eingelesen? - FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/" - + tmpFile.getName())); - log.info(new Date() + " - file moved"); + FileUtils.moveFile(tmpFile, + new File(Configuration.config.getAbsolute_path() + "prod/" + + filename)); + // int ret = sql.UpdateImagePath(filename); + if (sql.UpdateImagePath(filename) == 0) { + log.info(new Date() + " - file moved and database updated."); + } } catch (IOException e) { // TODO Auto-generated catch block + log.info(new Date() + " - Failed to move file."); e.printStackTrace(); } return true; @@ -267,46 +221,18 @@ public class ServerHandler implements Server.Iface { @Override public Map<String, String> getImageData(String imageid, String imageversion) throws TException { - - ResultSet data = sql.getImageData(con, imageid, imageversion); - - Map<String, String> map = new HashMap<String, String>(); - try { - while (data.next()) { - System.out.println(data - .getString("cond_hasInternetRestriction") - + data.getString("cond_hasLicenseRestriction") - + data.getString("cond_minCPUs") - + data.getString("cond_minRAM")); - map.put("name", data.getString("image_name")); - map.put("internet", - data.getString("cond_hasInternetRestriction")); - map.put("license", data.getString("cond_hasLicenseRestriction")); - map.put("cpu", data.getString("cond_minCPUs")); - map.put("ram", data.getString("cond_minRAM")); - - } - System.out.println("return success"); - log.info(new Date() + " - returning ImageData: "+map.size()); - return map; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - log.info(new Date() + " - returning ImageData: "+map.size()); - return null; - + log.info(new Date() + " - returning ImageData: " + + sql.getImageData(imageid, imageversion).size() + "items."); + return sql.getImageData(imageid, imageversion); } @Override public boolean updateImageData(String name, String newName, - boolean license, boolean internet, long ram, long cpu, String id, - String version) throws TException { - System.out.println("Server: Vor Update"); - sql.UpdateImageData(con, name, newName, license, internet, cpu, ram, - id, version); - System.out.println("Update erfolgreich"); - log.info(new Date() + " - updated ImageData"); + String image_path, boolean license, boolean internet, long ram, + long cpu, String id, String version, boolean isTemplate, + long filesize) throws TException { + sql.UpdateImageData(name, newName, image_path, license, internet, cpu, + ram, id, version, isTemplate, filesize); return false; } @@ -319,29 +245,13 @@ public class ServerHandler implements Server.Iface { @Override public List<Lecture> getLectureList() throws TException { - ResultSet res = sql.getLectureList(con); - - List<Lecture> list = new ArrayList<Lecture>(); - try { - - while (res.next()) { - list.add(new Lecture(res.getString("lectureID"), res - .getString("name"), res.getString("isActive"), res - .getString("startTime"), res.getString("endTime"), res - .getString("lastUsed"), res.getString("description"), - res.getString("image_name"), res.getString("user"))); + log.info(new Date().toString() + " - returning LectureList: " + + sql.getLectureList().size() + " items."); + return sql.getLectureList(); + - } - log.info(new Date() + " - returning LectureList: "+list.size()); - return list; - } catch (SQLException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - log.info(new Date() + " - returning LectureList: "+list.size()); - return null; } @Override @@ -350,22 +260,16 @@ 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 { - int pk_image = 0; + String pk_image = ""; int imageversion = 0; - ResultSet image = sql.getImageIDandVersion(con, imagename); + Map<String, String> image = sql.getImageIDandVersion(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); - - XMLCreator xml=new XMLCreator(con, newName); + pk_image = image.get("GUID"); + imageversion = Integer.parseInt(image.get("version")); + sql.updateLectureData(pk_image, imageversion, lastname, newName, desc, + shortdesc, startDate, endDate, isActive, id); + + XMLCreator xml = new XMLCreator(sql.getConnection(), newName); try { xml.create(newName); } catch (SQLException | ParserConfigurationException @@ -373,50 +277,67 @@ public class ServerHandler implements Server.Iface { // TODO Auto-generated catch block e.printStackTrace(); } - - sql.updateLectureData(con, pk_image, imageversion, lastname, newName, - desc, shortdesc, startDate, endDate, isActive, id); - log.info(new Date() + " - updated LectureData"); + + // sql.updateLectureData(con, pk_image, imageversion, lastname, newName, + // desc, shortdesc, startDate, endDate, isActive, id); return false; } - + @Override - public boolean deleteImageServer(String imageid, String imageversion) throws TException{ + public boolean deleteImageServer(String imageid, String imageversion) + throws TException { + + String stringFile = sql.getFile(imageid, imageversion); + log.info(new Date() + " - File to Delete: " + stringFile); + + File tmpFile = new File(Configuration.config.getAbsolute_path() + + stringFile); - String stringFile = sql.getFile(con, imageid, imageversion); - - File tmpFile = new File("127.0.0.1:" + stringFile); - try { - //File wird von Server gelöscht + // File wird von Server gel�scht FileUtils.forceDelete(tmpFile); - return true; - + } catch (IOException e) { - // TODO Auto-generated catch block + log.info(new Date() + " - Failed to execute deleteImageServer."); e.printStackTrace(); } - + return false; } - + @Override public boolean deleteImageData(String id, String version) throws TException { - return sql.deleteImage(con, id, version); + return sql.deleteImage(id, version); } @Override public boolean connectedToLecture(String id, String version) throws TException { // TODO Auto-generated method stub - return sql.connectedToLecture(con, id, version); + return sql.connectedToLecture(id, version); } - - public boolean deleteLecture(String id){ - return sql.deleteLecture(con, id); + + public boolean deleteLecture(String id, String hs, String user) { + Map<String, String> map = new HashMap<String, String>(); + map = sql.getDeleteXMLData(id); + try { + + String path = Configuration.config.getAbsolute_path() + + "temp/" + + map.get("date") + .substring(0, map.get("date").length() - 2) + "_" + + hs + "_" + user + "_" + map.get("name") + ".xml"; + File xmlFile = new File(path); + FileUtils.forceDelete(xmlFile); + } catch (IOException e) { + log.info(new Date() + " - Failed to execute deleteLecture"); + e.printStackTrace(); + } + return sql.deleteLecture(id); + } } diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java index 6f3d5a3d..a5509d04 100644 --- a/Dozentenmodulserver/src/server/startServer.java +++ b/Dozentenmodulserver/src/server/startServer.java @@ -1,11 +1,17 @@ package server; +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; +import models.Configuration; + import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; +import org.ini4j.InvalidFileFormatException; +import org.ini4j.Wini; import server.BinaryListener; @@ -29,6 +35,7 @@ public class startServer { public static void main(String[] args) { + //final ImageServerHandler handler = new ImageServerHandler(); @@ -48,14 +55,31 @@ public class startServer { //deprecated + + //get Configuration + try { + Wini ini=new Wini(new File("Server_Config.ini")); + Configuration.config.setAbsolute_path(ini.get("ftp", "path_absolute")); + Configuration.config.setSql_connection(ini.get("sql", "connection")); + Configuration.config.setSql_pass(ini.get("sql", "pass")); + Configuration.config.setSql_user(ini.get("sql", "user")); + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + //Start Server + BasicConfigurator.configure(); - log.info( new Date() + " - starting Application\n" ); + log.info("***** "+ new Date() + " - starting Application *****" ); Thread t; t = new Thread(new BinaryListener()); servers.add(t); t.start(); //information - log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); + //log.info( new Date()+" - new thread created. Now "+servers.size()+" thread(s).\n" ); // Run more servers // ... // Wait for all servers to die diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index d85068e8..775b17cb 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -4,10 +4,20 @@ import java.sql.*; import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Random;
+import java.util.UUID;
+
+import models.Configuration;
+
import org.apache.log4j.Logger;
import server.BinaryListener;
+import server.Image;
+import server.Lecture;
public class SQL {
@@ -23,21 +33,22 @@ public class SQL { }
try {
Connection con = DriverManager
- .getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=slx-ng-open");
+ .getConnection("jdbc:mysql://"+Configuration.config.getSql_connection()+"?user="+Configuration.config.getSql_user()+"&password="+Configuration.config.getSql_pass()+"");
con.setAutoCommit(false);
log.info(new Date() + " - Connection returned to Client.");
return con;
} catch (SQLException e) {
// TODO Auto-generated catch block
- log.info(new Date() + " - Could not return connection to Client.");
+ log.info(new Date() + " - Failed to return connection to Client.");
e.printStackTrace();
}
return null;
}
- public int writeFTPUser(Connection con, String user, String pass) {
+ public int writeFTPUser(String user, String pass) {
Statement stm;
try {
+ Connection con=getConnection();
stm = con.createStatement();
int ret = stm
@@ -45,83 +56,95 @@ public class SQL { + user
+ "',SHA1('"
+ pass
- + "'),'10001','12345','/srv/openslx/nfs/temp');");
+ + "'),'10001','12345','"+Configuration.config.getAbsolute_path()+"temp/');");
con.commit();
+ con.close();
log.info(new Date() + " - created FTPUser " + user + " : " + pass
+ ".");
return ret;
} catch (SQLException e) {
// TODO Auto-generated catch block
- log.info(new Date() + " - FTPUser not created.");
+ log.info(new Date() + " - Failed to writeFTPUser.");
e.printStackTrace();
}
return -1;
}
- public int DeleteUser(Connection con, String user) {
+ public int DeleteUser(String user) {
Statement stm;
try {
+ Connection con=getConnection();
stm = con.createStatement();
int ret = stm
.executeUpdate("DELETE FROM `bwLehrpool`.`FtpUsers` where User like '"
+ user + "';");
con.commit();
+ con.close();
log.info(new Date() + " - FTPUser " + user + " deleted.");
return ret;
} catch (SQLException e) {
// TODO Auto-generated catch block
- log.info(new Date() + " - Could not delete FTPUser " + user + ".");
+ log.info(new Date() + " - Failed to DeleteUser.");
e.printStackTrace();
}
return -1;
}
- public ResultSet getImage(Connection con) {
+ public ResultSet getImage() {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT image_name FROM bwLehrpool.m_VLData_imageInfo;");
-
+ con.close();
+ return rs;
+
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getImage.");
e.printStackTrace();
}
return null;
}
- public ResultSet getPathOfImage(Connection con, String image_id,
+ public String getPathOfImage(String image_id,
String version) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID='"
+ image_id
+ "' and imageVersion='"
+ version
+ "';");
+ String path=rs.getString("image_path");
+ con.close();
+ return path;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getPathOfImage.");
e.printStackTrace();
}
return null;
}
- public int setInstitution(Connection con, String university) {
+ public String setInstitution(String university) {
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet ret = stm
.executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'"
+ university + "';");
+
if (ret.next() == false) {
- Random rand = new Random();
- int id = rand.nextInt();
+
+ String id = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('"
+ id + "','" + university + "');");
con.commit();
@@ -129,22 +152,29 @@ public class SQL { .executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '"
+ university + "';");
rs.next();
- return rs.getInt("institutionID");
+ String institution=rs.getString("institutionID");
+ con.close();
+
+ return institution;
} else {
- return ret.getInt("institutionID");
+ String institution=ret.getString("institutionID");
+ con.close();
+ return institution;
}
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to setInstitution.");
e.printStackTrace();
}
- return -1;
+ return "-1";
}
- public int setPerson(Connection con, String login, String lastname,
- String firstname, String mail, Date lastlogin, int Institution) {
+ public String setPerson(String login, String lastname,
+ String firstname, String mail, Date lastlogin, String Institution) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet ret = stm
@@ -153,14 +183,15 @@ public class SQL { + "' and Vorname like '"
+ firstname
+ "';");
+
if (ret.next() == false) {
- Random rand = new Random();
- int id = rand.nextInt();
+
+ String id = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"
+ id
+ "','"
- +login
- +"','"
+ + login
+ + "','"
+ lastname
+ "','"
+ firstname
@@ -179,21 +210,27 @@ public class SQL { + firstname
+ "';");
rs.next();
- return rs.getInt("userID");
+ String userid=rs.getString("userID");
+ con.close();
+ return userid;
} else {
- return ret.getInt("userID");
+ ret.first();
+ String userid=ret.getString("userID");
+ con.close();
+ return userid;
}
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to setPerson.");
e.printStackTrace();
}
- return -1;
+ return "-1";
}
- public boolean setImageData(Connection con, int pk_person, boolean license,
+ public boolean setImageData(String pk_person, boolean license,
boolean internet, long cpu, long ram, String imagename,
- String imagePath) {
+ String imagePath, boolean isTemplate, long filesize) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -207,10 +244,11 @@ public class SQL { }
try {
+ Connection con=getConnection();
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('"
+
+ String uid = UUID.randomUUID().toString();
+ stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`)VALUES('"
+ uid // GUID_imageID
+ "',1,'" // imageVersion
+ imagename // image_name
@@ -236,53 +274,97 @@ public class SQL { + "','" + internet_bol // cond_hasInternetRestriction
+ "','" + ram // cond_minRAM
+ "','" + cpu // cond_minCPUs
+ + "','" + isTemplate //image_isTemplate
+ + "','" + filesize //image_filesize
+ "');");
con.commit();
-
+ con.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to setImageData.");
e.printStackTrace();
}
return true;
}
- public ResultSet getImageList(Connection con) {
- try {
- Statement stm = con.createStatement();
-
- return stm
- .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
+ public List<Image> getImageList() {
+
+ Connection con=getConnection();
+ Statement stm;
+ List<Image> list = new ArrayList<Image>();
+ try {
+ stm = con.createStatement();
+ ResultSet res=stm
+ .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
+
+
+
+
+ while (res.next()) {
+
+ list.add(new Image(res.getString("GUID_imageID"), res
+ .getString("imageVersion"),
+ res.getString("image_name"), res
+ .getString("cond_hasLicenseRestriction"), res
+ .getString("name"), res.getString("lecture"),
+ res.getString("image_update_time"), res
+ .getString("user")));
+
+ }
+
+ con.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
+
+ return list;
+
}
- public ResultSet getLectureList(Connection con) {
+ public List<Lecture> getLectureList() {
+ List<Lecture> list = new ArrayList<Lecture>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
-
- return stm
+ ResultSet res=stm
.executeQuery("SELECT l.lectureID, l.name, l.isActive,l.startTime,l.endTime,l.lastUsed,l.description, i.image_name, concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_lecture l, bwLehrpool.m_VLData_imageInfo i, bwLehrpool.m_user u where i.GUID_imageID=l.imageID and l.admin_owner=u.userID;");
+ while (res.next()) {
+ list.add(new Lecture(res.getString("lectureID"), res
+ .getString("name"), res.getString("isActive"), res
+ .getString("startTime"), res.getString("endTime"), res
+ .getString("lastUsed"), res.getString("description"),
+ res.getString("image_name"), res.getString("user")));
+
+ }
+ con.close();
+ return list;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getLectureList.");
e.printStackTrace();
}
return null;
}
- public ResultSet getAllOS(Connection con) {
-
+ public List<String> getAllOS() {
+ List<String> list = new ArrayList<>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet rs=stm
.executeQuery("SELECT name FROM bwLehrpool.m_operatingSystem;");
+ while (rs.next()) {
+ list.add(rs.getString("name"));
+ }
+ return list;
+
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getAllOS.");
e.printStackTrace();
}
@@ -290,24 +372,37 @@ public class SQL { }
- public ResultSet getPersonData(Connection con, String Vorname,
+ public Map<String,String> getPersonData(String Vorname,
String Nachname) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet rs= stm
.executeQuery("SELECT u.Nachname, u.Vorname, u.mail, i.name FROM bwLehrpool.m_user u, bwLehrpool.m_institution i where u.Nachname like '"
+ Nachname
+ "' and u.Vorname like '"
+ Vorname
+ "' and u.institution=i.institutionID;");
+ while (rs.next()) {
+
+ map.put("mail", rs.getString("mail"));
+ map.put("Nachname", rs.getString("Nachname"));
+ map.put("Vorname", rs.getString("Vorname"));
+ map.put("Hochschule", rs.getString("name"));
+
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getPersonData.");
e.printStackTrace();
}
return null;
}
- public int setLectureData(Connection con, int pk_person, int pk_image,
+ public int setLectureData(String pk_person, String pk_image,
int imageversion, String name, String desc, String shortdesc,
String start, String end, boolean isactive) {
@@ -318,9 +413,10 @@ public class SQL { active_bol = 1;
}
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- Random random = new Random();
- int uid = random.nextInt();
+
+ String uid = UUID.randomUUID().toString();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('"
+ uid
+ "','"
@@ -350,46 +446,75 @@ public class SQL { + "','"
+ pk_person + "');");
con.commit();
-
+ con.close();
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to setLectureData.");
e.printStackTrace();
}
return 0;
}
- public ResultSet getImageIDandVersion(Connection con, String name) {
+ public Map<String,String> getImageIDandVersion(String name) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm
+ ResultSet image= stm
.executeQuery("SELECT GUID_imageID, imageVersion FROM bwLehrpool.m_VLData_imageInfo where image_name like '"
+ name + "';");
+ while (image.next()) {
+ map.put("GUID", image.getString("GUID_imageID"));
+ map.put("version", String.valueOf(image.getString("imageVersion")));
+
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getImageIDandVersion.");
e.printStackTrace();
}
return null;
}
- public ResultSet getImageData(Connection con, String id, String version) {
+ public Map<String,String> getImageData(String id, String version) {
+ Map<String, String> map = new HashMap<String, String>();
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- System.out.println("Test");
- return stm
+ ResultSet data=stm
.executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ id + "' and imageVersion = '" + version + "' ;");
+ while (data.next()) {
+ System.out.println(data
+ .getString("cond_hasInternetRestriction")
+ + data.getString("cond_hasLicenseRestriction")
+ + data.getString("cond_minCPUs")
+ + data.getString("cond_minRAM"));
+ map.put("name", data.getString("image_name"));
+ map.put("internet",
+ data.getString("cond_hasInternetRestriction"));
+ map.put("license", data.getString("cond_hasLicenseRestriction"));
+ map.put("cpu", data.getString("cond_minCPUs"));
+ map.put("ram", data.getString("cond_minRAM"));
+ }
+ con.close();
+ return map;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getImageData.");
e.printStackTrace();
}
return null;
}
- public int UpdateImageData(Connection con, String name, String newName,
+ public int UpdateImageData(String name, String newName,String image_path,
boolean license, boolean internet, long cpu, long ram, String id,
- String version) {
+ String version, boolean isTemplate, long filesize) {
try {
+ Connection con=getConnection();
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
Statement stm = con.createStatement();
int newVersion = Integer.parseInt(version) + 1;
@@ -402,12 +527,14 @@ public class SQL { if (license == true) {
license_bol = 1;
}
- System.out.println(internet_bol);
- System.out.println(license_bol);
+ log.info(new Date() + " - 'image_name` = '" + newName+ "\n length of name="+newName.length());
+
stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `imageVersion` = '"
+ newVersion
+ "',`image_name` = '"
+ newName
+ + "',`image_path` = '"
+ + image_path
+ "',`image_update_time` = '"
+ formatter.format(new Date())
+ "',`rec_change_time` = '"
@@ -420,47 +547,47 @@ public class SQL { + ram
+ "',`cond_minCPUs` = '"
+ cpu
+ + "',`image_isTemplate` = '"
+ + isTemplate
+ + "',`image_filesize` = '"
+ + filesize
+ "' WHERE `GUID_imageID` = '"
+ id
+ "' AND `imageVersion` = '" + version + "';");
con.commit();
+ con.close();
return 0;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to UpdateImageData.");
e.printStackTrace();
}
return -1;
}
- /**
- *
- * @param id
- * @param version
- * @return
- */
-
- public boolean deleteImage(Connection con, String id, String version) {
+ public boolean deleteImage(String id, String version) {
try {
-
+ Connection con=getConnection();
Statement stm = con.createStatement();
stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
+ id + "' " + "AND imageVersion = '" + version + "';");
con.commit();
-
+ con.close();
return true;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to deleteImage.");
e.printStackTrace();
}
return false;
}
- public int updateLectureData(Connection con, int pk_image,
+ public int updateLectureData(String pk_image,
int imageversion, String name, String newName, String desc,
String shortdesc, String start, String end, boolean isactive,
String id) {
@@ -472,6 +599,7 @@ public class SQL { active_bol = 1;
}
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_lecture` SET `name` = '"
+ newName
@@ -491,9 +619,12 @@ public class SQL { + formatter.format(new Date())
+ "'WHERE `lectureID` = '" + id + "';");
con.commit();
+ con.close();
+ log.info(new Date() + " - Succeeded to updateLectureData.");
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to updateLectureData.");
e.printStackTrace();
}
@@ -501,20 +632,22 @@ public class SQL { }
- public boolean connectedToLecture(Connection con, String id, String version) {
+ public boolean connectedToLecture(String id, String version) {
try {
-
+ Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet rs = stm.executeQuery("SELECT lectureID FROM "
+ "bwLehrpool.m_VLData_lecture WHERE imageID = '" + id
+ "' AND imageVersion = '" + version + "';");
-
+ con.close();
return rs.first();
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date()
+ + " - Failed to execute method connectedToLecture.");
e.printStackTrace();
}
@@ -522,36 +655,97 @@ public class SQL { }
- public boolean deleteLecture(Connection con, String id) {
-
+ public boolean deleteLecture(String id) {
+
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"+ id + "';");
-
+ stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_lecture WHERE lectureID = '"
+ + id + "';");
+
con.commit();
-
+ con.close();
return true;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to deleteLecture.");
e.printStackTrace();
}
-
+
return false;
}
- public String getFile(Connection con, String imageid, String imageversion) {
-
+ public String getFile(String imageid, String imageversion) {
+
try {
+ Connection con=getConnection();
Statement stm = con.createStatement();
- return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo WHERE imageID = '" + imageid
- + "' AND imageVersion = '" + imageversion + "';").toString();
+ ResultSet rs = stm
+ .executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo WHERE GUID_imageID = '"
+ + imageid
+ + "' AND imageVersion = '"
+ + imageversion
+ + "';");
+ rs.next();
+ String path=rs.getString("image_path");
+ con.close();
+ return path;
} catch (SQLException e) {
// TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getFile.");
e.printStackTrace();
}
return null;
}
+
+ public Map<String,String> getDeleteXMLData(String id) {
+ Map<String, String> map = new HashMap<String, String>();
+ try {
+ Connection con=getConnection();
+ Statement stm = con.createStatement();
+
+ ResultSet rs = stm
+ .executeQuery("SELECT name, admin_createTime FROM bwLehrpool.m_VLData_lecture where lectureID='"
+ + id + "';");
+ rs.next();
+ map.put("date", rs.getString("admin_createTime").replace(" ", "")
+ .replace("-", "").replace(":", ""));
+ map.put("name", rs.getString("name"));
+
+
+ con.close();
+ return map;
+
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to getDeleteXMLData.");
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ public int UpdateImagePath(String name) {
+ try {
+ Connection con=getConnection();
+ Statement stm = con.createStatement();
+ String image_path="prod/"+name;
+
+ stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"
+ + image_path
+ + "' WHERE `image_path` = '"
+ + "temp/"+name + "';");
+ con.commit();
+ con.close();
+ return 0;
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ log.info(new Date() + " - Failed to UpdateImageData.");
+ e.printStackTrace();
+ }
+ return -1;
+ }
}
diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java index 111a6337..564543fa 100644 --- a/Dozentenmodulserver/src/util/XMLCreator.java +++ b/Dozentenmodulserver/src/util/XMLCreator.java @@ -18,12 +18,15 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import models.Configuration; + import org.apache.log4j.Logger; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; import server.BinaryListener; +import sql.SQL; public class XMLCreator { @@ -36,10 +39,11 @@ public class XMLCreator { private Statement st = null; private ResultSet rs = null; private String vmName; - private String filePath = "/srv/openslx/nfs/temp/"; + private String filePath = Configuration.config.getAbsolute_path()+"prod/"; private String imageName; private String xmlName; private static Logger log = Logger.getLogger( BinaryListener.class ); + // 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, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName, m_institution.name as institutionName " diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index f753176d..94ddde43 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -36,7 +36,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string image_id,string version), - bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath), + bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize), list<Image> getImageList(), list<Lecture> getLectureList(), list<string> getAllOS(), @@ -44,11 +44,11 @@ service Server{ bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), bool startFileCopy(string file), map<string,string> getImageData(string imageid, string imageversion), - bool updateImageData(string name, string newName,bool license, bool internet, int ram,int cpu, string id, string version), + bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize), map<string,string> getLectureData(string lecturename), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), bool deleteImageServer(string id, string version), bool connectedToLecture(string id, string version), - bool deleteLecture(string id), + bool deleteLecture(string id, string hs, string user), }
\ No newline at end of file |