From 2f32c50353372d24cafd016040af917668a0aefd Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:41:11 +0200 Subject: [PATCH] info: Merge nested if statements --- .../runelite/client/plugins/info/InfoPanel.java | 7 ++----- .../client/plugins/info/JRichTextPane.java | 17 +++++++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index 6b71f552a6..9227aba3af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -147,12 +147,9 @@ public class InfoPanel extends PluginPanel emailLabel.enableAutoLinkHandler(false); emailLabel.addHyperlinkListener(e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && e.getURL().toString().equals(RUNELITE_LOGIN)) { - if (e.getURL().toString().equals(RUNELITE_LOGIN)) - { - executor.execute(sessionManager::login); - } + executor.execute(sessionManager::login); } }); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java index b3e88b6a60..e86007d0b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java @@ -68,18 +68,15 @@ public class JRichTextPane extends JEditorPane { linkHandler = e -> { - if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null) + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && Desktop.isDesktopSupported()) { - if (Desktop.isDesktopSupported()) + try { - try - { - Desktop.getDesktop().browse(e.getURL().toURI()); - } - catch (URISyntaxException | IOException ex) - { - log.warn("Error opening link", ex); - } + Desktop.getDesktop().browse(e.getURL().toURI()); + } + catch (URISyntaxException | IOException ex) + { + log.warn("Error opening link", ex); } } };