summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
diff options
context:
space:
mode:
authorStephan Schwaer2015-09-29 18:00:13 +0200
committerStephan Schwaer2015-09-29 18:00:13 +0200
commit1b7dfd683bc059ddbc46a6964234f1a453e0a0cc (patch)
tree3fa301e8e55f462ac4db3b1c0f508dd3628f0f71 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
parentMerge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff)
downloadtutor-module-1b7dfd683bc059ddbc46a6964234f1a453e0a0cc.tar.gz
tutor-module-1b7dfd683bc059ddbc46a6964234f1a453e0a0cc.tar.xz
tutor-module-1b7dfd683bc059ddbc46a6964234f1a453e0a0cc.zip
[client] Added "Show linking lectures" button im imageDetailsW.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 57c825f5..824a3404 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -82,10 +82,10 @@ public abstract class MainWindow {
*
* @param clazz
*/
- public static void showPage(Class<? extends CompositePage> clazz) {
+ public static <T extends CompositePage> T showPage(Class<T> clazz) {
if (currentPage != null) {
if (!currentPage.requestHide()) {
- return; // Canceled by currently shown page
+ return null; // Canceled by currently shown page
}
currentPage.setVisible(false);
}
@@ -95,13 +95,14 @@ public abstract class MainWindow {
Gui.showMessageBox(mainWindow, "Tried to show unknown page " + clazz.getSimpleName(),
MessageType.ERROR, LOGGER, null);
Gui.exit(1);
- return;
+ return null;
}
// sets the starting preferred size.
currentPage.requestShow();
currentPage.setVisible(true);
mainWindow.validate();
+ return (T) currentPage;
}
public static void centerShell(Window shell) {
@@ -192,8 +193,6 @@ public abstract class MainWindow {
}
});
-
-
// Set layout for the mainshell, items added to the shell should get a gridData
mainContainer.setLayout(new BoxLayout(mainContainer, BoxLayout.PAGE_AXIS));
@@ -495,7 +494,7 @@ public abstract class MainWindow {
+ "korrigiert werden kann.\n\n" + "Ihr Computer: "
+ FormatHelper.longDate(now) + "\nSatelliten-Server: "
+ FormatHelper.longDate(status.serverTime),
- MessageType.WARNING, LOGGER, null);
+ MessageType.WARNING, LOGGER, null);
}
}
} catch (TException e) {
@@ -520,7 +519,9 @@ public abstract class MainWindow {
public PleaseWait() {
GridManager grid = new GridManager(this, 3);
grid.add(Box.createHorizontalGlue()).expand(true, true);
- grid.add(new JLabel("Bitte warten, suche Proxy-Konfiguration...")).expand(false, true).fill(true, true);
+ grid.add(new JLabel("Bitte warten, suche Proxy-Konfiguration..."))
+ .expand(false, true)
+ .fill(true, true);
grid.add(Box.createHorizontalGlue()).expand(true, true);
grid.finish(false);
}