From 479f76143f9e5b03a04ec084d9e8d7c07a2c9506 Mon Sep 17 00:00:00 2001 From: Stephan Schwär Date: Mon, 1 Feb 2021 08:16:32 +0900 Subject: [client] Fix register url in pop up message Now uses the same url that is being used for the registration button in the main login window. Issue #3825 --- .../java/org/openslx/dozmod/gui/window/BwIdmLinkWindow.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 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 04fc2beb..5a7dfd15 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,8 +4,6 @@ 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; import javax.swing.BoxLayout; @@ -18,12 +16,12 @@ import javax.swing.JTextArea; import org.apache.log4j.Logger; import org.openslx.dozmod.Branding; -import org.openslx.dozmod.authentication.ShibbolethEcp; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.GridManager; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.util.DesktopEnvironment; +import org.openslx.dozmod.util.DesktopEnvironment.Link; /** * Class for showing window with button to open registration page in browser. @@ -63,11 +61,7 @@ public class BwIdmLinkWindow extends JDialog implements UiFeedback { btnLink.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - try { - DesktopEnvironment.openWebpageUri(ShibbolethEcp.getRegistrationUrl().toURI()); - } catch (URISyntaxException e1) { - LOGGER.error("Could not convert from url to uri: ", e1); - } + DesktopEnvironment.openWebpage(Link.REGISTER_BWIDM); } }); @@ -75,7 +69,7 @@ public class BwIdmLinkWindow extends JDialog implements UiFeedback { grid.nextRow(); // text area for copying the link if needed. - JTextArea linkText = new JTextArea(ShibbolethEcp.getRegistrationUrl().toString()); + JTextArea linkText = new JTextArea(Link.REGISTER_BWIDM.uri.toString()); linkText.setEditable(false); linkText.setMaximumSize(linkText.getPreferredSize()); linkText.setMinimumSize(linkText.getPreferredSize()); -- cgit v1.2.3-55-g7522