1 files changed, 4 insertions, 26 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 6bd54d50..25213b0f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -2,13 +2,10 @@ package org.openslx.dozmod;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.BasicConfigurator;
@@ -18,6 +15,7 @@ import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
+import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.util.ProxyConfigurator;
 import org.openslx.thrifthelper.ThriftManager;
 
@@ -99,7 +97,7 @@ public class App {
 		try {
 			Config.init();
 		} catch (Exception e) {
-			showAwtMessage("Error loading configuration", e);
+			Gui.showMessageBox("Error loading configuration", MessageType.ERROR, LOGGER, e);
 			return;
 		}
 
@@ -113,15 +111,8 @@ public class App {
 			}
 		};
 		proxyThread.start();
-
-		// Check if we can load SWT by calling some library function
-		try {
-			Gui.display.getActiveShell();
-		} catch (Throwable e) {
-			showAwtMessage("Error loading SWT libraries", e);
-			return;
-		}
-		// Setup swing
+		
+		// Setup swing style
 		try {
 			UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
 		} catch (Exception e1) {
@@ -136,19 +127,6 @@ public class App {
 		ThriftManager.setMasterServerAddress("bwlp-masterserver.ruf.uni-freiburg.de");
 
 		MainWindow.open();
-
-		// start the main window
-		Gui.mainloop();
-	}
-
-	private static void showAwtMessage(String message, Throwable e) {
-		LOGGER.error(message, e);
-		if (e != null) {
-			StringWriter sw = new StringWriter();
-			e.printStackTrace(new PrintWriter(sw));
-			message += "\n\n" + sw.toString();
-		}
-		new AwtBox(null, message);
 	}
 
 	/**