diff options
| author | Stephan Schwaer | 2015-10-05 15:34:24 +0200 |
|---|---|---|
| committer | Stephan Schwaer | 2015-10-05 15:34:24 +0200 |
| commit | 913542c7d11767a3ab3779d8469f3ec6868a63b6 (patch) | |
| tree | 01b13751a33e82c6de02295ef52a3a665e7974f5 /dozentenmodul/src/main/java | |
| parent | [client] Add raised border to activity panels (diff) | |
| download | tutor-module-913542c7d11767a3ab3779d8469f3ec6868a63b6.tar.gz tutor-module-913542c7d11767a3ab3779d8469f3ec6868a63b6.tar.xz tutor-module-913542c7d11767a3ab3779d8469f3ec6868a63b6.zip | |
[client] Fixed NPE when opening links.
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java | 7 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java | 18 |
2 files changed, 15 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java index bf7dbc66..52eefc19 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/BwIDMLinkWindow.java @@ -4,6 +4,7 @@ import java.awt.Frame; import java.awt.GridBagConstraints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.net.URISyntaxException; import javax.swing.BorderFactory; import javax.swing.Box; @@ -65,7 +66,11 @@ public class BwIDMLinkWindow extends JDialog implements UiFeedback { btnLink.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - OpenLinks.openWebpage(Link.BwIDM); + try { + OpenLinks.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI()); + } catch (URISyntaxException e1) { + LOGGER.error("Could not convert from url to uri: ", e1); + } } }); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java index 7bf69d35..80a4a45d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java @@ -19,15 +19,11 @@ public class OpenLinks { public static enum Link { FAQ("http://bwlehrpool.hs-offenburg.de"), - VMWARE( - "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0%7CPLAYER-603%7Cproduct_downloads"), - INTRO( - "http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf"), - DOZMOD("http://bwlehrpool.hs-offenburg.de/#jfmulticontent_c25490-4"), - BwIDM(ShibbolethEcp.getRegistrationUrl().toString()); - + VMWARE("https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0%7CPLAYER-603%7Cproduct_downloads"), + INTRO("http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf"), + DOZMOD("http://bwlehrpool.hs-offenburg.de/#jfmulticontent_c25490-4"); - private final URI uri; + public final URI uri; private Link(String uri) { this.uri = URI.create(uri); @@ -43,9 +39,13 @@ public class OpenLinks { * @return success on true */ public static boolean openWebpage(Link location) { + return openWebpageUri(location.uri); + } + + public static boolean openWebpageUri(URI uri) { if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) { try { - desktop.browse(location.uri); + desktop.browse(uri); return true; } catch (Exception e) { LOGGER.error("Got exception in openWebpage: ", e); |