Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/src/server/ServerHandler.java

1 files changed, 10 insertions, 8 deletions

diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 2243fd43..9da0400d 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -105,7 +105,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite *Prototyp*");
+		setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top = (screenSize.height - 603) / 2;
 		int left = (screenSize.width - 722) / 2;
@@ -122,7 +122,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen");
+				JLabel lblNewLabel = new JLabel("Image verlinken");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -206,9 +206,12 @@ public class CreateLectureLink_GUI extends JFrame {
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
 			}
-		} catch (TException e2) {
+		} catch (TException e) {
 			// TODO Auto-generated catch block
-			e2.printStackTrace();
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e.getCause()+"\n"+e.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		comboBox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -374,10 +377,6 @@ public class CreateLectureLink_GUI extends JFrame {
 							try {
 								DateFormat formatter = new SimpleDateFormat(
 										"yyyy-MM-dd hh:mm:ss");
-								System.out.println("Veranstaltung angelegt um: "
-										+ formatter.format(
-												Lecture.lecture.getStartdate())
-												.toString());
 								client.writeLecturedata(
 										Lecture.lecture.getName(),
 										Lecture.lecture.getShortDesc(),
@@ -414,6 +413,9 @@ public class CreateLectureLink_GUI extends JFrame {
 												"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
 												"Error",
 												JOptionPane.ERROR_MESSAGE);
+								JOptionPane.showMessageDialog(null,
+										e1.getCause()+"\n"+e1.getMessage(),
+										"Debug-Message", JOptionPane.ERROR_MESSAGE);
 							}
 							con.closeThriftConnection();
 							dispose();