From 87eabc4f21e81ecb16e4aca10b616eefa1823ac6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 13:58:51 +0200 Subject: FAQ & OTRS --- .../src/gui/lecture/SearchLecture_GUI.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java') diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 413f1084..a8c417fa 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -42,6 +43,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -359,9 +362,43 @@ public class SearchLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } -- cgit v1.2.3-55-g7522 From 12b69856a4388107773b05b974667b580d18b53b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 14:10:30 +0200 Subject: faq otrs --- .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1348 -> 1351 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class | Bin 1325 -> 1325 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class | Bin 1324 -> 1327 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/CreateImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/EditImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/EditImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/FTPCreateUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchEditImage_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 4 ++-- .../src/gui/image/SearchMethodLecture_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureLink_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureSearch_GUI.java | 4 ++-- .../src/gui/lecture/ExtendedSearchForImages_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java | 4 ++-- 24 files changed, 42 insertions(+), 42 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index faac5bc5..22538b35 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class index 5a20444c..aac529c9 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class index e6cb6231..457d19d5 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 8fba3fb9..faf95699 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -302,7 +302,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -322,7 +322,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index f9cd20dd..6add313b 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -362,7 +362,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -382,7 +382,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 6725850b..49a97051 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -319,7 +319,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -339,7 +339,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 7636c946..e8d0f5f8 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -346,7 +346,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -365,7 +365,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 3a78e322..f36a4c5d 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -370,7 +370,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); @@ -390,7 +390,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { } }); menu.add(menuItem_1); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index fa164171..671b2170 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -298,7 +298,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -318,7 +318,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 68bd4bb1..3c17a3e5 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -360,7 +360,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -380,7 +380,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 1195b8a3..b6ea90b4 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -472,7 +472,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -492,7 +492,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 735c6c99..8fc7d164 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -427,7 +427,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -447,7 +447,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 065b3da7..17b6ab59 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -247,7 +247,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -267,7 +267,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 268acb14..c0a20379 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -195,7 +195,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -215,7 +215,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4e010f75..7d3d9cae 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -413,7 +413,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -433,7 +433,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 93300f3e..c94586d8 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -215,7 +215,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -236,7 +236,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmOTRS = new JMenuItem("OTRS"); mntmOTRS.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 3192da83..55074482 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -495,7 +495,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -515,7 +515,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index daec54ad..62cebb22 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -461,7 +461,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -481,7 +481,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 32110a9f..da30680c 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -415,7 +415,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -435,7 +435,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index cab588d9..67f86a13 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -410,7 +410,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -430,7 +430,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index bd69a2ac..fbbc56f3 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -452,7 +452,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -472,7 +472,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 08a68f7f..7ca24016 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -473,7 +473,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -493,7 +493,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index cd417720..d818ddeb 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -236,7 +236,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -256,7 +256,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index a8c417fa..f54b048a 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -364,7 +364,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -384,7 +384,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); -- cgit v1.2.3-55-g7522 From 32dff35f3cf3a74f62b64105fd57f7da0e2027dc Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 15 May 2014 11:17:06 +0200 Subject: Es wird nur noch eine Verbindung zum bwLehrpoolSuite Server geöffnet. --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12528 -> 12576 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 835 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 887 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9756 -> 9804 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 2125 -> 2001 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 1014 -> 890 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1351 -> 1351 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13316 -> 13362 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 1884 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 11146 -> 11192 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12853 -> 12898 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 830 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1820 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2042 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12411 -> 12459 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class | Bin 927 -> 806 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class | Bin 914 -> 793 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1796 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 835 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12192 -> 12240 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9626 -> 10031 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 2326 -> 2326 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 12 ++++++------ .../src/gui/image/EditImageAllgemein_GUI.java | 8 ++++---- .../src/gui/image/FTPCreateUploader_GUI.java | 9 +++++---- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 10 +++++----- .../src/gui/image/FTPEditUploader_GUI.java | 7 ++++--- .../src/gui/image/SearchEditImage_GUI.java | 14 +++++++------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 10 +++++----- Dozentenmodul/src/gui/intro/Login_GUI.java | 11 +++++++++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 7 ++++--- .../src/gui/lecture/DeleteLecture_GUI.java | 10 +++++----- .../src/gui/lecture/EditLectureLink_GUI.java | 8 +++++--- .../src/gui/lecture/EditLectureSearch_GUI.java | 10 +++++----- .../src/gui/lecture/SearchLecture_GUI.java | 8 ++++---- Dozentenmodul/src/models/Client.java | 19 +++++++++++++++++++ Dozentenmodul/src/thrift/ThriftConnection.java | 7 ++++++- 44 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 Dozentenmodul/src/models/Client.java (limited to 'Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 567fc96b..09814b8a 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 6617ad6e..e3f2472b 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index 1a5a0fe5..4acbdfaf 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index b2656782..042234c9 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 94acbae9..23d60d2f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class index 0081eba4..03680a6f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index e20cfac9..21e46d35 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class index c9ed851b..214beaa8 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index 22538b35..cc06860f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 704bd616..02cb7abd 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class index 2053e90e..6267c626 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index a39211bb..45ca0eae 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 74aaef08..04c8b107 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index aa1b5a70..a846427a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 910cc1d1..bde5917c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 196208c4..58a8dce5 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index cdf3cad7..81f1d246 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index 5d6c601d..61318fe0 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class index 7207fba7..9fabf945 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class index 64a6e9c9..c98d437a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class index 24a37378..6c550b56 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class index 88e9e10c..033c3dda 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class index 95a953f3..245edb20 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index d7bc6bab..13b9fe67 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 780e5fd1..3f9d2221 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class index 6ecad17e..570e91d4 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 6db87dc2..8d8f8918 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index aff3176d..91b73e2a 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index 40003a69..290acaad 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 79e37076..9fc4110d 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -70,8 +70,8 @@ public class DeleteImage_GUI extends JFrame { JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + ThriftConnection con=new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -201,7 +201,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -250,7 +250,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -420,7 +420,7 @@ public class DeleteImage_GUI extends JFrame { // if (client.deleteImageServer(imageid // ,imageversion)) { - con.closeThriftConnection(); + DeleteImage_GUI di = new DeleteImage_GUI(); @@ -497,7 +497,7 @@ public class DeleteImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 49a97051..a3c21ddf 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -50,7 +50,7 @@ public class EditImageAllgemein_GUI extends JFrame { private JTextField EMail; private JTextField imagename; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); private JPanel panel_2; private JLabel lblNewLabel; private JTextPane txtpnBitteWhlenSie; @@ -221,7 +221,7 @@ public class EditImageAllgemein_GUI extends JFrame { public void mouseClicked(MouseEvent arg0) { // Durch den Klick auf Button Hauptmenpü wird dieses Fenster // unsichtbar und das Hauptmenü sichtbar - con.closeThriftConnection(); + EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -261,7 +261,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Setzen der Eingabe im Model, dadurch bleiben die // Daten bei einem erneuten Aufruf verfügbar // Image.image.setImagename(imagename.getText()); - con.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -288,7 +288,7 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); - con.closeThriftConnection(); + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 8c14fa01..0643728f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPCreateUploader_GUI extends JFrame implements double speed; long bytesread; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton finishButton = new JButton("Fertigstellen"); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -115,6 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -332,7 +333,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -349,7 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnZurck.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); - thrift.closeThriftConnection(); + CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI(); m.setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 1deb6cff..97a29849 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -70,8 +70,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener long bytesread; JLabel labelZeit; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zur\u00FCck"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnMainMenu = new JButton("Hauptmen\u00FC"); @@ -87,7 +87,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + con.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -355,7 +355,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Debug-Message", JOptionPane.ERROR_MESSAGE); } } - thrift.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -368,7 +368,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener btnMainMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - thrift.closeThriftConnection(); + MainMenue_GUI mm = new MainMenue_GUI(); mm.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 6b2e0d66..99fc034b 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPEditUploader_GUI extends JFrame implements long bytesread; boolean taskrun = false; int progress = 0; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); JButton finishButton = new JButton("Fertigstellen"); @@ -113,6 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -334,7 +335,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } - thrift.closeThriftConnection(); + } }); btnZurck.addActionListener(new ActionListener() { diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index b6ea90b4..ec1ceb8e 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -70,7 +70,7 @@ public class SearchEditImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchEditImage_GUI extends JFrame { SearchEditImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchEditImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -412,7 +412,7 @@ public class SearchEditImage_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + // check if user is in correct tab if (tabbedPane.getSelectedIndex() == 0) { @@ -434,7 +434,7 @@ public class SearchEditImage_GUI extends JFrame { 8).toString(); Image.image.setVersion(imageversion); - con.closeThriftConnection(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 8fc7d164..73f0b9bb 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -70,7 +70,7 @@ public class SearchImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchImage_GUI extends JFrame { SearchImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index b30a33a7..b6249be0 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -29,6 +29,7 @@ import org.apache.thrift.TException; import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.ThriftConnection; import thrift.UserInfo; import config.config_file; import javax.swing.SwingConstants; @@ -207,7 +208,13 @@ public class Login_GUI extends JFrame { SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); System.out.println("Satellit-Adresse: " + result.serverAddress); - + + //set connection to bwLehrpoolSuiteServer + ThriftConnection bwthrift=new ThriftConnection(); + server.Server.Client bwClient=bwthrift.getThriftConnection(); + models.Client.clientcon.setClient(bwClient); + + System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId @@ -240,7 +247,7 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setVorname(user.firstName); person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); - + try { // Lege config File an und entscheide welches Fenster // als nächstes geöffnet wird diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 62cebb22..610df2f3 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -68,7 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -90,6 +90,7 @@ public class CreateLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } @@ -349,7 +350,7 @@ public class CreateLectureLink_GUI extends JFrame { JButton cancelButton = new JButton("Zur\u00FCck"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI(); eVAG.setVisible(true); dispose(); @@ -420,7 +421,7 @@ public class CreateLectureLink_GUI extends JFrame { e1.getCause()+"\n"+e1.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - con.closeThriftConnection(); + dispose(); } else { diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index da30680c..33192436 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -69,7 +69,7 @@ public class DeleteLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -195,7 +195,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -210,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -350,7 +350,7 @@ public class DeleteLecture_GUI extends JFrame { if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ System.out.println("Löschen erfolgreich"); //delete successful - con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); dl.setVisible(true); dispose(); @@ -386,7 +386,7 @@ public class DeleteLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index fbbc56f3..b0f30cd9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -66,8 +66,8 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -89,6 +89,7 @@ public class EditLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } }); @@ -417,7 +418,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } - thrift.closeThriftConnection(); + + MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 7ca24016..6ce8897a 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -72,7 +72,7 @@ public class EditLectureSearch_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -196,7 +196,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -211,7 +211,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -339,7 +339,7 @@ public class EditLectureSearch_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -427,7 +427,7 @@ public class EditLectureSearch_GUI extends JFrame { Lecture.lecture.setActive(false); } - con.closeThriftConnection(); + // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index f54b048a..d686f5f9 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -68,7 +68,7 @@ public class SearchLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -192,7 +192,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -207,7 +207,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -335,7 +335,7 @@ public class SearchLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java new file mode 100644 index 00000000..6dc587f1 --- /dev/null +++ b/Dozentenmodul/src/models/Client.java @@ -0,0 +1,19 @@ +package models; + +public class Client { + + private server.Server.Client client; + + public static Client clientcon=new Client(); + + public server.Server.Client getClient() { + return client; + } + + public void setClient(server.Server.Client client) { + this.client = client; + } + + + +} diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 7652fbe7..dcd441bc 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -17,7 +17,11 @@ public class ThriftConnection { private String satAddress = ""+SessionData.session.getServerAdress(); final TTransport transport = new TSocket(satAddress, 9090); - //final TTransport transport = new TSocket("141.79.128.102", 9090); + + public ThriftConnection() { + // TODO Auto-generated constructor stub + } + public Client getThriftConnection() { @@ -34,6 +38,7 @@ public class ThriftConnection { } final TProtocol protocol = new TBinaryProtocol(transport); + final Server.Client client = new Server.Client(protocol); System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); -- cgit v1.2.3-55-g7522 From 9cca7c1254dfbb4bb01e2216cb2edcfd2911d56b Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 May 2014 18:22:25 +0200 Subject: ddd --- Dozentenmodul/bin/Models/person.class | Bin 2032 -> 2032 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 1068 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/models/person.class | Bin 2032 -> 2032 bytes Dozentenmodul/src/Models/person.java | 2 -- .../src/gui/image/CreateImageTechnisch_GUI.java | 2 +- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 6 ++-- .../src/gui/image/EditImageAllgemein_GUI.java | 10 +++--- .../src/gui/image/EditImageTechnisch_GUI.java | 8 ++--- .../src/gui/image/SearchEditImage_GUI.java | 34 +++++++++--------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 30 ++++++++-------- .../src/gui/image/SearchMethodLecture_GUI.java | 2 +- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 2 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 38 ++++++++++----------- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 20 +++++------ .../gui/lecture/CreateLectureAllgemein_GUI.java | 6 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 6 ++-- .../src/gui/lecture/DeleteLecture_GUI.java | 24 ++++++------- .../src/gui/lecture/EditLectureLink_GUI.java | 6 ++-- .../src/gui/lecture/EditLectureSearch_GUI.java | 20 +++++------ .../src/gui/lecture/SearchLecture_GUI.java | 16 ++++----- Dozentenmodul/src/models/person.java | 2 -- .../src/thrift/MasterThriftConnection.java | 2 +- Dozentenmodul/src/thrift/ThriftConnection.java | 4 +-- 24 files changed, 118 insertions(+), 122 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java') diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class index cd28d135..36fa9761 100644 Binary files a/Dozentenmodul/bin/Models/person.class and b/Dozentenmodul/bin/Models/person.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class index 9f6b64d0..34afa967 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class index 3dc0bd94..5b26c8f5 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class differ diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class index cd28d135..36fa9761 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index fdb5e18a..67b6b84e 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -13,8 +13,6 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 6add313b..308ff3b7 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -172,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); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 6d68db49..c2ae79d5 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -207,7 +207,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Fenster Extended GUI con.closeThriftConnection(); - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -260,7 +260,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Hauuetmenue con.closeThriftConnection(); - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -511,7 +511,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Hauptmen\u00FC con.closeThriftConnection(); - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 3addca31..c0ad0a06 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -73,7 +73,7 @@ public class EditImageAllgemein_GUI extends JFrame { System.exit(0); } }); - // Verhindert das vergrößern des Fensters + // Verhindert das vergroessern des Fensters setResizable(false); try { @@ -222,8 +222,8 @@ public class EditImageAllgemein_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Durch den Klick auf Button Hauptmenpü wird dieses Fenster - // unsichtbar und das Hauptmenü sichtbar + // 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(); @@ -262,7 +262,7 @@ public class EditImageAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { // Setzen der Eingabe im Model, dadurch bleiben die - // Daten bei einem erneuten Aufruf verfügbar + // Daten bei einem erneuten Aufruf verfuegbar // Image.image.setImagename(imagename.getText()); SearchEditImage_GUI se = new SearchEditImage_GUI(); @@ -282,7 +282,7 @@ public class EditImageAllgemein_GUI extends JFrame { if (imagename.getText().length() <= 0) { JOptionPane.showMessageDialog(null, "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", + "Daten nicht vollst\u00e4ndig", JOptionPane.INFORMATION_MESSAGE); } else { diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index e8d0f5f8..1bbfa699 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -64,7 +64,7 @@ public class EditImageTechnisch_GUI extends JFrame { } }); - // Verhindert das Vergrößern des Fensters + // Verhindert das Vergroeßern des Fensters setResizable(false); try { @@ -195,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); @@ -288,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(); @@ -317,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(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index ec1ceb8e..a810e1a6 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -96,7 +96,7 @@ public class SearchEditImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -190,7 +190,7 @@ public class SearchEditImage_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -203,12 +203,12 @@ public class SearchEditImage_GUI extends JFrame { comboBox = new JComboBox(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List 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) { @@ -218,12 +218,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( @@ -239,7 +239,7 @@ public class SearchEditImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -360,7 +360,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( @@ -380,7 +380,7 @@ public class SearchEditImage_GUI extends JFrame { } 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); } } @@ -397,7 +397,7 @@ public class SearchEditImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -440,12 +440,12 @@ public class SearchEditImage_GUI extends JFrame { 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 } @@ -511,7 +511,7 @@ public class SearchEditImage_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List images; try { @@ -523,7 +523,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(), @@ -531,7 +531,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 73f0b9bb..8fbf015c 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -96,7 +96,7 @@ public class SearchImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -190,7 +190,7 @@ public class SearchImage_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -203,12 +203,12 @@ public class SearchImage_GUI extends JFrame { comboBox = new JComboBox(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List 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) { @@ -218,12 +218,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( @@ -239,7 +239,7 @@ public class SearchImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -360,7 +360,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( @@ -380,7 +380,7 @@ public class SearchImage_GUI extends JFrame { } 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); } } @@ -397,7 +397,7 @@ public class SearchImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -466,7 +466,7 @@ public class SearchImage_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List images; try { @@ -478,7 +478,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(), @@ -486,7 +486,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 17b6ab59..67472c17 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -114,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); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index c0a20379..fd1246bc 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -168,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) { diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index b6249be0..34469617 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -55,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) { @@ -88,7 +88,7 @@ public class Login_GUI extends JFrame { } }); - // Fenster darf nicht vergrößert werden + // Fenster darf nicht vergroessert werden setResizable(false); try { @@ -104,9 +104,9 @@ public class Login_GUI extends JFrame { } // 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; @@ -120,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 @@ -131,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."); @@ -152,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) { @@ -168,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() { @@ -218,7 +218,7 @@ public class Login_GUI extends JFrame { 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) { @@ -250,23 +250,23 @@ public class Login_GUI extends JFrame { try { // Lege config File an und entscheide welches Fenster - // als nächstes geöffnet wird + // 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(); @@ -274,7 +274,7 @@ public class Login_GUI extends JFrame { setVisible(false); } else { - // Öffne das Hauptmenü + // oeffne das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); setVisible(false); @@ -308,7 +308,7 @@ 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(); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 41254bea..401cbda0 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -157,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); @@ -172,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(); @@ -238,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); } }); @@ -254,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); } }); @@ -278,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); } }); @@ -293,7 +293,7 @@ public class MainMenue_GUI extends JFrame { */ JLabel lblGrafik = new JLabel(""); - // ToolTipp für Grafik + // ToolTipp fuer Grafik lblGrafik .setToolTipText("" + "Ein virtuelles Labor besteht immer aus den beiden Komponenten
" diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 55074482..21d84e2a 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -398,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 { @@ -419,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 @@ -441,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 diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index ac923dca..ff19ed13 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -402,10 +402,10 @@ public class CreateLectureLink_GUI extends JFrame { 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) { @@ -427,7 +427,7 @@ public class CreateLectureLink_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); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 33192436..ec27b4f5 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -66,7 +66,7 @@ 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 = models.Client.clientcon.getClient(); @@ -103,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 { @@ -194,7 +194,7 @@ public class DeleteLecture_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -209,7 +209,7 @@ public class DeleteLecture_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -339,16 +339,16 @@ 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, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ - System.out.println("Löschen erfolgreich"); + System.out.println("L\u00f6schen erfolgreich"); //delete successful DeleteLecture_GUI dl = new DeleteLecture_GUI(); @@ -359,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); } @@ -385,7 +385,7 @@ public class DeleteLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -454,7 +454,7 @@ public class DeleteLecture_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -465,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, @@ -474,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/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 97fdcdda..1f3e395d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -357,7 +357,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) { @@ -401,7 +401,7 @@ public class EditLectureLink_GUI extends JFrame { 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); @@ -413,7 +413,7 @@ 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); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 6ce8897a..a57b126e 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -69,7 +69,7 @@ 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 = models.Client.clientcon.getClient(); @@ -105,7 +105,7 @@ public class EditLectureSearch_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -195,7 +195,7 @@ public class EditLectureSearch_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -210,7 +210,7 @@ public class EditLectureSearch_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -338,7 +338,7 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -437,14 +437,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 @@ -512,7 +512,7 @@ public class EditLectureSearch_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -523,7 +523,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, @@ -532,7 +532,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/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index d686f5f9..31bb1605 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -65,7 +65,7 @@ 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 = models.Client.clientcon.getClient(); @@ -101,7 +101,7 @@ public class SearchLecture_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -191,7 +191,7 @@ public class SearchLecture_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -206,7 +206,7 @@ public class SearchLecture_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -334,7 +334,7 @@ public class SearchLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -403,7 +403,7 @@ public class SearchLecture_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -414,7 +414,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, @@ -423,7 +423,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/person.java b/Dozentenmodul/src/models/person.java index fdb5e18a..67b6b84e 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -13,8 +13,6 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index 24d034f2..760b8bd0 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -23,7 +23,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 dcd441bc..3eec5d25 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -28,12 +28,12 @@ public class ThriftConnection { 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; } -- cgit v1.2.3-55-g7522 From f424dced4900ee93a0f2f7e15215e97189debba7 Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 22 May 2014 13:36:35 +0200 Subject: aa --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12576 -> 12783 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 1094 -> 768 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 830 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1820 -> 817 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2042 -> 1820 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12459 -> 12640 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 1066 -> 744 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 1273 -> 744 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 806 -> 1066 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 1274 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 793 -> 646 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1613 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 1796 -> 793 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 835 -> 1613 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12240 -> 12409 bytes .../lecture/ExtendedSearchForImages_GUI$1.class | Bin 786 -> 937 bytes .../lecture/ExtendedSearchForImages_GUI$2.class | Bin 937 -> 931 bytes .../lecture/ExtendedSearchForImages_GUI$3.class | Bin 931 -> 1395 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 6724 -> 6580 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 26 +++++++++++++++------ .../src/gui/image/SearchEditImage_GUI.java | 20 +++++++++++----- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 20 +++++++++++----- .../src/gui/lecture/DeleteLecture_GUI.java | 8 +++---- .../src/gui/lecture/EditLectureLink_GUI.java | 8 +++---- .../src/gui/lecture/EditLectureSearch_GUI.java | 20 +++++++++++----- .../gui/lecture/ExtendedSearchForImages_GUI.java | 7 +----- .../src/gui/lecture/SearchLecture_GUI.java | 20 +++++++++++----- Dozentenmodulserver/bin/sql/SQL.class | Bin 22501 -> 22519 bytes Dozentenmodulserver/src/sql/SQL.java | 4 +++- 29 files changed, 87 insertions(+), 46 deletions(-) (limited to 'Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 43b41609..4ca2208c 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/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class index 885bcd1e..704987c5 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 58a8dce5..16663b1c 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index 81f1d246..854ba9e1 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index 61318fe0..d0b7743e 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class index 9fabf945..e86ccb8f 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class index 4400254b..74425fa4 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 eca0e58d..c9eec04e 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 c98d437a..07430748 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 46b870e2..8c0f7192 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 6c550b56..af115764 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 0908c65a..fc4f734d 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 033c3dda..730cfbe9 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 245edb20..120af287 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 13b9fe67..f5971a3c 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/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class index 194553e1..c0f8c1c4 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 beea9e15..68c602c3 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 764ffbee..a84d1ea3 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 c6169313..3eeb8494 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index c2ae79d5..72ee98fa 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -75,8 +75,16 @@ public class DeleteImage_GUI extends JFrame { "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con=new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final 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 rowSorterAll = new TableRowSorter( modelAll); final TableRowSorter rowSorterMyImages = new TableRowSorter( @@ -109,7 +117,7 @@ public class DeleteImage_GUI extends JFrame { }); // Verhindert das Vergroessern Des Fensters setResizable(false); - + try { // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -199,7 +207,7 @@ public class DeleteImage_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) { @@ -209,13 +217,13 @@ public class DeleteImage_GUI extends JFrame { // 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(332, 106, 188, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox(); @@ -324,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(); @@ -632,6 +643,7 @@ public class DeleteImage_GUI extends JFrame { images.get(x).getVersion() }; // System.out.println("id:"+images.get(x).getId()); // F\u00FCge diese Objekte der Tabelle hinzu + model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index a810e1a6..30e2b06d 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -71,8 +71,16 @@ public class SearchEditImage_GUI extends JFrame { "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final 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 rowSorterAll = new TableRowSorter( modelAll); final TableRowSorter rowSorterMyImages = new TableRowSorter( @@ -186,19 +194,19 @@ public class SearchEditImage_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(365, 106, 155, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 8fbf015c..f9c3811b 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -71,8 +71,16 @@ public class SearchImage_GUI extends JFrame { "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final 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 rowSorterAll = new TableRowSorter( modelAll); final TableRowSorter rowSorterMyImages = new TableRowSorter( @@ -186,19 +194,19 @@ public class SearchImage_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(360, 106, 160, 14); panel_1.add(lblErweiterteSuche); comboBox = new JComboBox(); 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"); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 646784d3..f995d70d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -184,17 +184,17 @@ public class EditLectureLink_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) { - 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(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index a57b126e..7bd42034 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -73,8 +73,16 @@ public class EditLectureSearch_GUI extends JFrame { "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + 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 rowSorterAll = new TableRowSorter( modelAll); final TableRowSorter rowSorterMyLectures = new TableRowSorter( @@ -191,19 +199,19 @@ public class EditLectureSearch_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(326, 106, 194, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index d818ddeb..8d605ef3 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -63,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 { diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 31bb1605..18eb411a 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -69,8 +69,16 @@ public class SearchLecture_GUI extends JFrame { "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); - final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); + 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 rowSorterAll = new TableRowSorter( modelAll); final TableRowSorter rowSorterMyLectures = new TableRowSorter( @@ -187,19 +195,19 @@ public class SearchLecture_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(315, 106, 205, 14); panel_1.add(lblErweiterteSuche); JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 9392d9ff..46fc24af 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 6d8bb8b7..775b17cb 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -141,6 +141,7 @@ public class SQL { ResultSet ret = stm .executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'" + university + "';"); + if (ret.next() == false) { String id = UUID.randomUUID().toString(); @@ -687,8 +688,9 @@ public class SQL { + imageversion + "';"); rs.next(); + String path=rs.getString("image_path"); con.close(); - return rs.getString("image_path"); + return path; } catch (SQLException e) { // TODO Auto-generated catch block -- cgit v1.2.3-55-g7522