Merge pull request #153 from adamk33n3r/151-bug-empty-config-section

fix: add request focus section to config prop

src/main/java/com/adamk33n3r/runelite/watchdog/FlashOverlay.java

@@ -13,7 +13,10 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.inject.Inject;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.time.Instant;
 
 @Slf4j

src/main/java/com/adamk33n3r/runelite/watchdog/GameMessageType.java

@@ -7,7 +7,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Getter
 public enum GameMessageType implements Displayable {

src/main/java/com/adamk33n3r/runelite/watchdog/NotificationOverlay.java

@@ -4,7 +4,6 @@
 
 import net.runelite.api.Client;
 import net.runelite.client.ui.ClientUI;
-import net.runelite.client.ui.overlay.OverlayMenuEntry;
 import net.runelite.client.ui.overlay.OverlayPanel;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -21,7 +20,6 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Collectors;
 

src/main/java/com/adamk33n3r/runelite/watchdog/PlayerChatType.java

@@ -7,7 +7,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Getter
 public enum PlayerChatType implements Displayable {

src/main/java/com/adamk33n3r/runelite/watchdog/SoundItem.java

@@ -1,6 +1,7 @@
 package com.adamk33n3r.runelite.watchdog;
 
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 import java.io.File;
 

src/main/java/com/adamk33n3r/runelite/watchdog/SoundPlayer.java

@@ -1,12 +1,13 @@
 package com.adamk33n3r.runelite.watchdog;
 
-import jaco.mp3.player.MP3Player;
-import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.ui.ClientUI;
 
+import jaco.mp3.player.MP3Player;
+import lombok.extern.slf4j.Slf4j;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.sound.sampled.*;

src/main/java/com/adamk33n3r/runelite/watchdog/TrayNotifier.java

@@ -1,9 +1,5 @@
 package com.adamk33n3r.runelite.watchdog;
 
-import com.google.common.base.Strings;
-import com.google.common.escape.Escaper;
-import com.google.common.escape.Escapers;
-import lombok.extern.slf4j.Slf4j;
 import net.runelite.client.RuneLite;
 import net.runelite.client.RuneLiteProperties;
 import net.runelite.client.chat.ChatMessageManager;
@@ -12,10 +8,15 @@
 import net.runelite.client.ui.ClientUI;
 import net.runelite.client.util.OSType;
 
+import com.google.common.base.Strings;
+import com.google.common.escape.Escaper;
+import com.google.common.escape.Escapers;
+import lombok.extern.slf4j.Slf4j;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
-import java.awt.*;
+import java.awt.TrayIcon;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;

src/main/java/com/adamk33n3r/runelite/watchdog/Util.java

@@ -1,13 +1,12 @@
 package com.adamk33n3r.runelite.watchdog;
 
 import net.runelite.api.GameObject;
-import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.client.util.Text;
 
 import com.google.common.base.Splitter;
 
-import java.awt.*;
+import java.awt.Color;
 import java.text.Normalizer;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/com/adamk33n3r/runelite/watchdog/WatchdogConfig.java

@@ -420,7 +420,8 @@ public interface WatchdogConfig extends Config {
     @ConfigItem(
         keyName = DEFAULT_FORCE_FOCUS,
         name = "Force Focus",
-        description = "Sets the default focus mode to force"
+        description = "Sets the default focus mode to force",
+        section = requestFocusSection
     )
     default boolean defaultRequestFocusForce() { return false; }
     //endregion

src/main/java/com/adamk33n3r/runelite/watchdog/WatchdogPanel.java

@@ -6,13 +6,15 @@
 import com.adamk33n3r.runelite.watchdog.ui.ImportExportDialog;
 import com.adamk33n3r.runelite.watchdog.ui.MessagePickerDialog;
 import com.adamk33n3r.runelite.watchdog.ui.alerts.*;
-import com.adamk33n3r.runelite.watchdog.ui.panels.*;
+import com.adamk33n3r.runelite.watchdog.ui.panels.AlertListPanel;
+import com.adamk33n3r.runelite.watchdog.ui.panels.HistoryPanel;
+import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
+import com.adamk33n3r.runelite.watchdog.ui.panels.ToolsPanel;
 
 import net.runelite.api.Client;
 import net.runelite.api.MessageNode;
 import net.runelite.client.events.NotificationFired;
 import net.runelite.client.ui.ColorScheme;
-import net.runelite.client.ui.MultiplexingPluginPanel;
 import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.util.LinkBrowser;
 

src/main/java/com/adamk33n3r/runelite/watchdog/WatchdogPlugin.java

@@ -1,12 +1,7 @@
 package com.adamk33n3r.runelite.watchdog;
 
-import com.adamk33n3r.runelite.watchdog.alerts.Alert;
-import com.adamk33n3r.runelite.watchdog.alerts.ChatAlert;
-import com.adamk33n3r.runelite.watchdog.alerts.NotificationFiredAlert;
-import com.adamk33n3r.runelite.watchdog.notifications.ScreenFlash;
-import com.adamk33n3r.runelite.watchdog.notifications.TrayNotification;
-
 import com.adamk33n3r.runelite.watchdog.ui.notifications.screenmarker.ScreenMarkerUtil;
+
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import net.runelite.api.MessageNode;
@@ -41,8 +36,8 @@
 
 import javax.inject.Inject;
 import javax.inject.Provider;
-import javax.swing.*;
-import java.util.List;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
 import java.util.Properties;
 import java.util.Queue;
 

src/main/java/com/adamk33n3r/runelite/watchdog/hub/AlertHubClient.java

@@ -15,7 +15,6 @@
 import javax.inject.Inject;
 import java.awt.image.BufferedImage;
 import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Comparator;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/GameMessage.java

@@ -4,14 +4,14 @@
 import com.adamk33n3r.runelite.watchdog.WatchdogConfig;
 import com.adamk33n3r.runelite.watchdog.WatchdogPlugin;
 
-import lombok.experimental.Accessors;
 import net.runelite.api.ChatMessageType;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatMessageBuilder;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.chat.QueuedMessage;
 
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.inject.Inject;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/Notification.java

@@ -6,7 +6,6 @@
 import com.adamk33n3r.runelite.watchdog.WatchdogPlugin;
 import com.adamk33n3r.runelite.watchdog.alerts.Alert;
 
-import lombok.experimental.Accessors;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.client.ui.ClientUI;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/Overhead.java

@@ -3,7 +3,6 @@
 import com.adamk33n3r.runelite.watchdog.Util;
 import com.adamk33n3r.runelite.watchdog.WatchdogConfig;
 
-import lombok.experimental.Accessors;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.Player;
@@ -12,7 +11,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import lombok.experimental.Accessors;
 
 import javax.inject.Inject;
 import java.awt.Color;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/RequestFocus.java

@@ -2,12 +2,12 @@
 
 import com.adamk33n3r.runelite.watchdog.WatchdogConfig;
 
-import lombok.experimental.Accessors;
 import net.runelite.client.ui.ClientUI;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import javax.inject.Inject;
 

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/ScreenFlash.java

@@ -4,12 +4,12 @@
 import com.adamk33n3r.runelite.watchdog.WatchdogPlugin;
 import com.adamk33n3r.runelite.watchdog.alerts.FlashMode;
 
-import lombok.experimental.Accessors;
 import net.runelite.client.config.FlashNotification;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import javax.inject.Inject;
 import java.awt.Color;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/Sound.java

@@ -8,7 +8,6 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
-import lombok.extern.slf4j.Slf4j;
 
 import javax.inject.Inject;
 import java.io.File;

src/main/java/com/adamk33n3r/runelite/watchdog/notifications/SoundEffect.java

@@ -3,13 +3,13 @@
 import com.adamk33n3r.runelite.watchdog.Util;
 import com.adamk33n3r.runelite.watchdog.WatchdogConfig;
 
-import lombok.experimental.Accessors;
 import net.runelite.api.Client;
 import net.runelite.api.SoundEffectVolume;
 import net.runelite.client.callback.ClientThread;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import javax.inject.Inject;
 

src/main/java/com/adamk33n3r/runelite/watchdog/ui/AlertListItem.java

@@ -6,18 +6,19 @@
 import com.adamk33n3r.runelite.watchdog.alerts.AlertGroup;
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
 
-import lombok.Setter;
 import net.runelite.client.plugins.config.ConfigPlugin;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.components.MouseDragEventForwarder;
 import net.runelite.client.util.ImageUtil;
 
 import lombok.Getter;
+import lombok.Setter;
 
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;

src/main/java/com/adamk33n3r/runelite/watchdog/ui/ComparableNumber.java

@@ -2,12 +2,16 @@
 
 import com.adamk33n3r.runelite.watchdog.Displayable;
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
+
+import net.runelite.client.ui.DynamicGridLayout;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.runelite.client.ui.DynamicGridLayout;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import java.awt.Dimension;
 import java.util.function.Consumer;
 
 public class ComparableNumber extends JPanel {

src/main/java/com/adamk33n3r/runelite/watchdog/ui/MessagePickerDialog.java

@@ -4,7 +4,9 @@
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.GridLayout;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 

src/main/java/com/adamk33n3r/runelite/watchdog/ui/alerts/LocationAlertPanel.java

@@ -2,15 +2,13 @@
 
 import com.adamk33n3r.runelite.watchdog.WatchdogPanel;
 import com.adamk33n3r.runelite.watchdog.alerts.LocationAlert;
-import com.adamk33n3r.runelite.watchdog.ui.PlaceholderTextField;
 import com.adamk33n3r.runelite.watchdog.ui.panels.AlertPanel;
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
+
 import net.runelite.api.Client;
-import net.runelite.api.coords.WorldPoint;
 
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.GridLayout;
 
 public class LocationAlertPanel extends AlertPanel<LocationAlert> {
     private final Client client;

src/main/java/com/adamk33n3r/runelite/watchdog/ui/alerts/NotificationPickerButton.java

@@ -4,7 +4,8 @@
 import com.adamk33n3r.runelite.watchdog.ui.Icons;
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
 
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JPanel;
 import java.util.function.Consumer;
 
 public class NotificationPickerButton extends JPanel {

src/main/java/com/adamk33n3r/runelite/watchdog/ui/alerts/StatChangedAlertPanel.java

@@ -4,8 +4,8 @@
 import com.adamk33n3r.runelite.watchdog.alerts.StatChangedAlert;
 import com.adamk33n3r.runelite.watchdog.ui.ComparableNumber;
 import com.adamk33n3r.runelite.watchdog.ui.panels.AlertPanel;
-
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
+
 import net.runelite.api.Skill;
 
 public class StatChangedAlertPanel extends AlertPanel<StatChangedAlert> {

src/main/java/com/adamk33n3r/runelite/watchdog/ui/alerts/XPDropAlertPanel.java

@@ -4,8 +4,8 @@
 import com.adamk33n3r.runelite.watchdog.alerts.XPDropAlert;
 import com.adamk33n3r.runelite.watchdog.ui.ComparableNumber;
 import com.adamk33n3r.runelite.watchdog.ui.panels.AlertPanel;
-
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;
+
 import net.runelite.api.Skill;
 
 public class XPDropAlertPanel extends AlertPanel<XPDropAlert> {

src/main/java/com/adamk33n3r/runelite/watchdog/ui/notifications/panels/DismissOverlayNotificationPanel.java

@@ -3,7 +3,6 @@
 import com.adamk33n3r.runelite.watchdog.LengthLimitFilter;
 import com.adamk33n3r.runelite.watchdog.SimpleDocumentListener;
 import com.adamk33n3r.runelite.watchdog.notifications.DismissOverlay;
-import com.adamk33n3r.runelite.watchdog.notifications.Notification;
 import com.adamk33n3r.runelite.watchdog.ui.FlatTextArea;
 import com.adamk33n3r.runelite.watchdog.ui.panels.NotificationsPanel;
 import com.adamk33n3r.runelite.watchdog.ui.panels.PanelUtils;

src/main/java/com/adamk33n3r/runelite/watchdog/ui/notifications/panels/NotificationPanel.java

@@ -16,7 +16,9 @@
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 

src/main/java/com/adamk33n3r/runelite/watchdog/ui/notifications/panels/ScreenMarkerNotificationPanel.java

@@ -15,7 +15,6 @@
 import net.runelite.client.ui.components.colorpicker.ColorPickerManager;
 
 import javax.swing.JButton;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSpinner;
 import javax.swing.text.AbstractDocument;