From f424dced4900ee93a0f2f7e15215e97189debba7 Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 22 May 2014 13:36:35 +0200 Subject: aa --- Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java') diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index ec27b4f5..ae228c1e 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -190,19 +190,19 @@ public class DeleteLecture_GUI extends JFrame { textFieldName.setColumns(10); JLabel lblErweiterteSuche = new JLabel( - "Erweiterte Suche"); + "Erweiterte Suche*Folgt noch*"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { // oeffnet das Fenster Extended GUI - 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(336, 106, 184, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); -- cgit v1.2.3-55-g7522 From a4531f554892e07e3203f69df0f03179e9c2d019 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 22 May 2014 15:41:52 +0200 Subject: Überflüssige Main-Methoden entfernt --- .../bin/gui/image/CreateImageTechnisch_GUI$1.class | Bin 758 -> 758 bytes .../bin/gui/image/CreateImageTechnisch_GUI$2.class | Bin 847 -> 847 bytes .../bin/gui/image/CreateImageTechnisch_GUI$3.class | Bin 1673 -> 1673 bytes .../bin/gui/image/CreateImageTechnisch_GUI$4.class | Bin 1667 -> 1667 bytes .../bin/gui/image/CreateImageTechnisch_GUI.class | Bin 8933 -> 8672 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12783 -> 12524 bytes .../bin/gui/image/FTPCreateUploader_GUI$1.class | Bin 792 -> 1907 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 813 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 2001 -> 890 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 890 -> 1351 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1351 -> 682 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13362 -> 13102 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1186 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 1990 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12898 -> 12641 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 744 -> 744 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 744 -> 744 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 1066 -> 1066 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 1273 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 646 -> 646 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1274 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 793 -> 793 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 1613 -> 1613 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12409 -> 12409 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class | Bin 695 -> 695 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 5748 -> 5748 bytes .../gui/lecture/CreateLectureAllgemein_GUI$1.class | Bin 1034 -> 1034 bytes .../gui/lecture/CreateLectureAllgemein_GUI$2.class | Bin 869 -> 869 bytes .../gui/lecture/CreateLectureAllgemein_GUI$3.class | Bin 926 -> 926 bytes .../gui/lecture/CreateLectureAllgemein_GUI$4.class | Bin 923 -> 923 bytes .../gui/lecture/CreateLectureAllgemein_GUI$5.class | Bin 1922 -> 1922 bytes .../gui/lecture/CreateLectureAllgemein_GUI$6.class | Bin 3105 -> 3105 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10976 -> 10714 bytes .../gui/lecture/EditLectureAllgemein_GUI$1.class | Bin 768 -> 768 bytes .../gui/lecture/EditLectureAllgemein_GUI$2.class | Bin 857 -> 857 bytes .../gui/lecture/EditLectureAllgemein_GUI$3.class | Bin 1892 -> 1892 bytes .../gui/lecture/EditLectureAllgemein_GUI$4.class | Bin 1951 -> 1951 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 10195 -> 9932 bytes .../lecture/ExtendedSearchForImages_GUI$1.class | Bin 937 -> 937 bytes .../lecture/ExtendedSearchForImages_GUI$2.class | Bin 931 -> 931 bytes .../lecture/ExtendedSearchForImages_GUI$3.class | Bin 1395 -> 1395 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 6580 -> 6320 bytes Dozentenmodul/bin/models/Image.class | Bin 2387 -> 2387 bytes Dozentenmodul/bin/models/Lecture.class | Bin 2226 -> 2226 bytes Dozentenmodul/bin/models/person.class | Bin 2032 -> 2032 bytes Dozentenmodul/bin/models/user.class | Bin 718 -> 718 bytes .../src/gui/image/CreateImageTechnisch_GUI.java | 14 +------------- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 16 ---------------- .../src/gui/image/FTPCreateUploader_GUI.java | 19 +------------------ .../src/gui/image/FTPEditUploader_GUI.java | 18 +----------------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 3 --- .../src/gui/image/SearchMethodLecture_GUI.java | 16 +--------------- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 3 --- .../gui/lecture/CreateLectureAllgemein_GUI.java | 15 --------------- .../src/gui/lecture/CreateLectureLink_GUI.java | 16 +--------------- .../src/gui/lecture/DeleteLecture_GUI.java | 16 +--------------- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 17 +---------------- .../src/gui/lecture/EditLectureLink_GUI.java | 16 +--------------- .../src/gui/lecture/EditLectureSearch_GUI.java | 15 +-------------- .../gui/lecture/ExtendedSearchForImages_GUI.java | 21 +-------------------- .../src/gui/lecture/SearchLecture_GUI.java | 14 -------------- Dozentenmodul/src/models/Client.java | 1 - Dozentenmodul/src/models/Image.java | 3 +-- Dozentenmodul/src/models/Lecture.java | 3 --- Dozentenmodul/src/models/person.java | 5 ----- Dozentenmodul/src/models/user.java | 1 + 67 files changed, 12 insertions(+), 220 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class index 1d67fe3e..519d3b0f 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class index 9fc35b48..2283207b 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class index 4aedd907..722ecdf2 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class index 2c9cd712..739451cd 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class index 82d24993..6cd45653 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 4ca2208c..d40f6d68 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class index 353bafa4..f591fa7e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 23d60d2f..14f49298 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class index 03680a6f..65f6eba8 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index 21e46d35..5aa7bc75 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class index 214beaa8..225b1b06 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index cc06860f..41c5b0cc 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index e6bf572b..abaa79bc 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 04c8b107..ef0dedf1 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index a846427a..3e960f4f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index bde5917c..f8767194 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class index 74425fa4..aebbf028 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class index c9eec04e..d599dabe 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class index 07430748..9949e5fe 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class index 8c0f7192..41208104 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class index af115764..33cf65cb 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class index fc4f734d..b74a9bf2 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class index 730cfbe9..88c5fdfe 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class index 120af287..b55da9f2 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index f5971a3c..1b6063c8 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class index e1f554c7..799a2aab 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class index dbfc1944..8b5da380 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class index 12d4c61f..3577fd18 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class index 51b3d910..db82c341 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class index ceea662a..49b37d40 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class index 67922a25..aeea08eb 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class index 11cda571..8446b2d1 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class index 0759ddca..60c57e03 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 8f480656..5fcc981a 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class index 0c7b67a0..6a5bcf01 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class index 09461d3a..4a021966 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class index 59b84bd3..c9f61e8d 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class index ddd0274d..75c03435 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class index e8fd3516..62618f9e 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class index c0f8c1c4..6d2d2df7 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class index 68c602c3..51e86415 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class index a84d1ea3..c5d4f8cf 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class index 3eeb8494..1490e214 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class index 59b34fab..0167c7c5 100644 Binary files a/Dozentenmodul/bin/models/Image.class and b/Dozentenmodul/bin/models/Image.class differ diff --git a/Dozentenmodul/bin/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class index a0cb753d..31755bcf 100644 Binary files a/Dozentenmodul/bin/models/Lecture.class and b/Dozentenmodul/bin/models/Lecture.class differ diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class index 36fa9761..ef2a89eb 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/bin/models/user.class b/Dozentenmodul/bin/models/user.class index af67dd13..cd274e48 100644 Binary files a/Dozentenmodul/bin/models/user.class and b/Dozentenmodul/bin/models/user.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 308ff3b7..45331b21 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -8,7 +8,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; @@ -53,18 +52,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JRadioButton rdbtnInternetNein; private final ButtonGroup buttonGrouplicense = new ButtonGroup(); private final ButtonGroup buttonGroupInternet = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 72ee98fa..ca5408ae 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -50,11 +49,9 @@ 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; import thrift.ThriftConnection; import javax.swing.ListSelectionModel; @@ -90,19 +87,6 @@ public class DeleteImage_GUI extends JFrame { final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - DeleteImage_GUI dialog = new DeleteImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 3adb426a..b1394c0e 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -3,7 +3,6 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -41,7 +40,6 @@ import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; -//import util.XMLCreator; import ftp.UploadTask; import gui.intro.MainMenue_GUI; import javax.swing.JMenuItem; @@ -80,22 +78,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JButton btnZurck = new JButton("Zur\u00FCck"); int progress = 0; // progress of upload - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPCreateUploader_GUI frame = new FTPCreateUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - + /** * Create the frame. */ diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 99fc034b..05846e25 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -3,7 +3,6 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; @@ -80,22 +79,7 @@ public class FTPEditUploader_GUI extends JFrame implements JButton finishButton = new JButton("Fertigstellen"); JButton btnZurck = new JButton("Zur\u00FCck"); - /** - * Launch the application. - */ - public static void main(String[] args) { - EventQueue.invokeLater(new Runnable() { - public void run() { - try { - FTPEditUploader_GUI frame = new FTPEditUploader_GUI(); - frame.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - + /** * Create the frame. */ diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index f9c3811b..80274087 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -48,10 +48,7 @@ import javax.swing.table.TableRowSorter; import models.Image; import models.Links; import models.person; -//import models.person; - import org.apache.thrift.TException; - import server.Server.Client; import thrift.ThriftConnection; diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 67472c17..ac9fb96f 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -15,10 +15,8 @@ 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.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -33,7 +31,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; - import models.Links; @SuppressWarnings("serial") @@ -45,18 +42,7 @@ public class SearchMethodLecture_GUI extends JFrame { JRadioButton rdbtnSearchByLecture; private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 4d610587..7e8f2ffd 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -28,7 +28,6 @@ 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; @@ -44,8 +43,6 @@ 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; private JButton btnWindows; diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 21d84e2a..8c937204 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -1,7 +1,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -15,7 +14,6 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -39,7 +37,6 @@ import java.awt.ScrollPane; import java.io.IOException; import java.util.Calendar; import java.util.Date; - import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; @@ -65,18 +62,6 @@ public class CreateLectureAllgemein_GUI extends JFrame { boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateLectureAllgemein_GUI dialog = new CreateLectureAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index ff19ed13..af5a75ea 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -1,7 +1,6 @@ package gui.lecture; import gui.intro.MainMenue_GUI; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -24,7 +23,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -70,19 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - CreateLectureLink_GUI dialog = new CreateLectureLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index ae228c1e..dd58ec60 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -44,7 +43,6 @@ 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; @@ -78,19 +76,7 @@ public class DeleteLecture_GUI extends JFrame { modelMyLectures); private JButton button; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 67f86a13..27355602 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -15,9 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; - import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -31,7 +29,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; - import models.Image; import models.Lecture; import models.Links; @@ -39,7 +36,6 @@ 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; @@ -61,18 +57,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JDateChooser dateChooserstart; JRadioButton radioButtonno; private final ButtonGroup buttonGroup = new ButtonGroup(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index f995d70d..4e5641f1 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -2,7 +2,6 @@ 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; @@ -24,7 +23,6 @@ import java.util.Iterator; import java.util.List; import javax.swing.JButton; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -70,19 +68,7 @@ public class EditLectureLink_GUI extends JFrame { ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureLink_GUI dialog = new EditLectureLink_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 7bd42034..68b0ad13 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -22,7 +22,6 @@ import java.text.SimpleDateFormat; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -88,19 +87,7 @@ public class EditLectureSearch_GUI extends JFrame { final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - + /** * Create the dialog. */ diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 8d605ef3..45413401 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -3,7 +3,6 @@ package gui.lecture; import gui.image.CreateImageAllgemein_GUI; import gui.image.FTPCreateUploader_GUI; - import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -11,13 +10,9 @@ import java.awt.SystemColor; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -31,9 +26,7 @@ import javax.swing.UIManager; 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; @@ -45,19 +38,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { String[] result; private JTextField textField; private JTextField textField_1; - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - - } catch (Exception e) { - e.printStackTrace(); - } - } + /** * Create the dialog. diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 18eb411a..19497a65 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; -import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; @@ -43,7 +42,6 @@ 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; @@ -84,18 +82,6 @@ public class SearchLecture_GUI extends JFrame { final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - EditLectureSearch_GUI dialog = new EditLectureSearch_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * Create the dialog. diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java index 6dc587f1..42eccdec 100644 --- a/Dozentenmodul/src/models/Client.java +++ b/Dozentenmodul/src/models/Client.java @@ -3,7 +3,6 @@ package models; public class Client { private server.Server.Client client; - public static Client clientcon=new Client(); public server.Server.Client getClient() { diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index 0b3c936e..e08ed5a2 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -1,9 +1,9 @@ package models; public class Image { + private String ImageId; private String version; - private String imagename; private String newName; private String imagepath; @@ -12,7 +12,6 @@ public class Image { private int ram; private int cpu; private long filesize; - public static Image image =new Image(); diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java index 6b7e6fa1..eae05ec5 100644 --- a/Dozentenmodul/src/models/Lecture.java +++ b/Dozentenmodul/src/models/Lecture.java @@ -4,7 +4,6 @@ import java.util.Date; public class Lecture { - private String name; private String newName; private String shortDesc; @@ -14,8 +13,6 @@ public class Lecture { private boolean active; private String id; private String linkedImagename; - - public static Lecture lecture =new Lecture(); diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index 67b6b84e..0f14af51 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -3,9 +3,7 @@ package models; public class person{ - private String username; - private String Name; private String Vorname; private String Hochschule; @@ -13,11 +11,8 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); - public String getUsername() { return username; } diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java index be64937f..9aa958a4 100644 --- a/Dozentenmodul/src/models/user.java +++ b/Dozentenmodul/src/models/user.java @@ -4,6 +4,7 @@ public class user { private String userName; private String Password; + public String getUserName() { return userName; } -- cgit v1.2.3-55-g7522