From 4466132eb2d6219e92148f12ef1f7691ce08b281 Mon Sep 17 00:00:00 2001
From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com>
Date: Tue, 28 May 2019 12:21:22 +0200
Subject: [PATCH] Fix scrolling position (#423)

* Fix remembering scroll position when textfiel contains text

* Catch exception in custom swap that can cause the plugin to fail loading

* Fix checkstyle ConfigPanel
---
 .../runelite/client/plugins/config/ConfigPanel.java  | 12 +++++++++++-
 .../menuentryswapper/MenuEntrySwapperPlugin.java     | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
index 0601438c4c..9efc0fe2f4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
@@ -32,6 +32,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@@ -199,6 +200,15 @@ public class ConfigPanel extends PluginPanel
 
 	}
 
+	static class configTextArea extends JTextArea
+	{
+		@Override
+		public void scrollRectToVisible(final Rectangle aRect)
+		{
+			// supress scrollToRect in textarea
+		}
+	}
+
 	private void initializePluginList()
 	{
 		final List<String> pinnedPlugins = getPinnedPluginNames();
@@ -652,7 +662,7 @@ public class ConfigPanel extends PluginPanel
 					}
 					else
 					{
-						final JTextArea textArea = new JTextArea();
+						final JTextArea textArea = new configTextArea();
 						textArea.setLineWrap(true);
 						textArea.setWrapStyleWord(true);
 						textField = textArea;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index 3689c9c67d..dac44aa31b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -1155,7 +1155,16 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 		if (!Strings.isNullOrEmpty(config))
 		{
-			Map<String, String> split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config);
+			Map<String, String> split;
+
+			try
+			{
+				split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config);
+			}
+			catch (IllegalArgumentException ex)
+			{
+				return;
+			}
 
 			for (Map.Entry<String, String> entry : split.entrySet())
 			{