diff options
| author | Jonathan Bauer | 2015-07-10 16:44:33 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-07-10 16:44:33 +0200 |
| commit | a151cf8426685e6cdaa97e36513ddbb98f7c1600 (patch) | |
| tree | 3b4a30bb89828ac516aff45661fc1a5ac0627fff | |
| parent | [client] Catch a Throwable to handly any kind of (unexpected) error when init... (diff) | |
| download | tutor-module-a151cf8426685e6cdaa97e36513ddbb98f7c1600.tar.gz tutor-module-a151cf8426685e6cdaa97e36513ddbb98f7c1600.tar.xz tutor-module-a151cf8426685e6cdaa97e36513ddbb98f7c1600.zip | |
[client] fix missing setControl in ImageMetaDataPageLayout
optimize how the app starts
3 files changed, 9 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java index 95a1f10b..e0f83b92 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java @@ -103,6 +103,13 @@ public class App { setupLogger(); + // Initialize the proxy settings + try { + ProxyConfigurator.init(); + } catch (IOException e) { + showAwtMessage("Could not detect proxy server automatically. No proxy server will be used", e); + } + // Check if we can load SWT by calling some library function try { Gui.display.getActiveShell(); @@ -115,15 +122,6 @@ public class App { // Set master server to use (TODO: make configurable via command line) ThriftManager.setMasterServerAddress("bwlp-masterserver.ruf.uni-freiburg.de"); - // Initialize the proxy settings - try { - ProxyConfigurator.init(); - } catch (IOException e) { - MainWindow.showMessageBox( - "Could not detect proxy server automatically. No proxy server will be used", - MessageType.WARNING, LOGGER, e); - } - // start the main window MainWindow.mainloop(); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java index 3c27407d..f48deb96 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java @@ -83,6 +83,8 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { linkPermissionsCheck.setText("Verlinken"); adminPermissionsCheck = new Button(permissionsGroup, SWT.CHECK); adminPermissionsCheck.setText("Admin"); + + setControl(container); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java index fed7fc2e..f9386502 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java @@ -75,7 +75,6 @@ public abstract class ImageUploadPageLayout extends WizardPage { // required to avoid an error in the system <-- TODO: WTF? setControl(container); - setPageComplete(editExistingImage); } |