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, 7 insertions, 11 deletions

diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index e6bb055e..7c35bf00 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -2,7 +2,6 @@ package gui.image;
 
 import gui.intro.MainMenue_GUI;
 import gui.lecture.ExtendedSearchForImages_GUI;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -77,14 +76,6 @@ public class SearchEditImage_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
 			modelMyImages);
 
-	/**
-	 * Launch the application.
-	 * 
-	 * public static void main(String[] args) { try { SearchEditImage_GUI dialog
-	 * = new SearchEditImage_GUI();
-	 * dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-	 * dialog.setVisible(true); } catch (Exception e) { e.printStackTrace(); } }
-	 */
 
 	/**
 	 * Create the dialog.
@@ -115,7 +106,7 @@ public class SearchEditImage_GUI extends JFrame {
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite *Prototyp*");
+		setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten");
 		// Zentriert das Fenster in die Bildmitte
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top = (screenSize.height - 722) / 2;
@@ -221,6 +212,9 @@ public class SearchEditImage_GUI extends JFrame {
 		} catch (TException e2) {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e2.getCause()+"\n"+e2.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		// Registriert Auswahländerungen der Box
 		comboBox.addActionListener(new ActionListener() {
@@ -274,7 +268,6 @@ public class SearchEditImage_GUI extends JFrame {
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
-				System.out.println(tabbedPane.getSelectedIndex());
 				if (tabbedPane.getSelectedIndex() == 0) {
 
 					String username = person.verantwortlicher.getName() + " "
@@ -513,6 +506,9 @@ public class SearchEditImage_GUI extends JFrame {
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e1.getCause()+"\n"+e1.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		return model;
 	}