summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/App.java
diff options
context:
space:
mode:
authorJonathan Bauer2015-03-03 19:02:48 +0100
committerJonathan Bauer2015-03-03 19:02:48 +0100
commit0447841f3a08890bf746625d0f17976adada6ac8 (patch)
treef63bd9f2ac8d77f4732b70cac8e5c0497f4d3a45 /dozentenmodul/src/main/java/App.java
parentwarnings fix (diff)
downloadtutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.gz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.tar.xz
tutor-module-0447841f3a08890bf746625d0f17976adada6ac8.zip
bwIDM - Shibboleth login working for Freiburg's SP - more to come
rework GUI classes to work with GuiManager: use GuiManager.show(<GUI to show>) and GuiManager.openPopup(<popup like About_GUI or ListAllOtherUsers_GUI>) only! static openlinks class (models/links.java deleted). There are keywords to open links, e.g. OpenLinks.openWebpage("faq"). Please see the class.
Diffstat (limited to 'dozentenmodul/src/main/java/App.java')
-rw-r--r--dozentenmodul/src/main/java/App.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 2d6be271..11ab05a8 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -1,5 +1,3 @@
-import gui.intro.Login_GUI;
-
import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
@@ -11,6 +9,7 @@ import org.apache.log4j.FileAppender;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
+import util.GuiManager;
import config.Config;
import config.ConfigProxy;
@@ -51,6 +50,7 @@ public class App {
LOGGER.info("Logger initialised.");
}
+
public static void main(final String[] args) {
// Pruefe und Erzeuge gegebenfalls Config
@@ -76,10 +76,7 @@ public class App {
EventQueue.invokeLater(new Runnable() {
public void run() {
try {
- // Aufruf und Anzeige des Login Fensters
- Login_GUI frame = new Login_GUI(args);
- frame.setVisible(true);
-
+ GuiManager.initGui();
} catch (Exception e) {
e.printStackTrace();
JOptionPane.showMessageDialog(null, e.getStackTrace(),