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, 22 insertions, 3 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index cd952d0f..7e6b42a0 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -24,6 +24,7 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JSeparator;
@@ -50,8 +51,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	private final JPanel contentPanel = new JPanel();
 	JLabel lblPath;
 	JProgressBar progressBar;
-	String host = "141.79.128.121";
-	//String host = "141.79.128.102";
+	//String host = "141.79.128.121";
+	String host = "141.79.128.102";
 	int port = 21;
 	server.User user;
 	String filename = "";
@@ -103,6 +104,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					} catch (TException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
+						JOptionPane.showMessageDialog(null,
+								e1.getCause()+"\n"+e1.getMessage(),
+								"Debug-Message", JOptionPane.ERROR_MESSAGE);
 					}
 					task.cancel(true);
 				}
@@ -117,11 +121,14 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e.getCause()+"\n"+e.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 
 		// filename=name;
 		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul *Prototyp*");
+		setTitle("Dozentenmodul *Prototyp* - Image erzeugen");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top = (screenSize.height - 722) / 2;
 		int left = (screenSize.width - 603) / 2;
@@ -299,6 +306,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
 					e1.printStackTrace();
+					JOptionPane.showMessageDialog(null,
+							e1.getCause()+"\n"+e1.getMessage(),
+							"Debug-Message", JOptionPane.ERROR_MESSAGE);
 				}
 			}
 		});
@@ -341,6 +351,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
+								JOptionPane.showMessageDialog(null,
+										e1.getCause()+"\n"+e1.getMessage(),
+										"Debug-Message", JOptionPane.ERROR_MESSAGE);
 							}
 							task.cancel(true);
 						}
@@ -386,6 +399,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e.getCause()+"\n"+e.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
@@ -485,6 +501,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					e.getCause()+"\n"+e.getMessage(),
+					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
 		return true;