You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2023/10/01 17:08:25 UTC

[logging-chainsaw] branch master updated: migrated LogPanel to it's own package

This is an automated email from the ASF dual-hosted git repository.

grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git


The following commit(s) were added to refs/heads/master by this push:
     new 385ea42  migrated LogPanel to it's own package
385ea42 is described below

commit 385ea42ab089e54651ed5e51603e6be2e45e92ee
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 19:08:17 2023 +0200

    migrated LogPanel to it's own package
---
 .../apache/log4j/chainsaw/ChainsawConstants.java   | 28 +++++++--------
 .../chainsaw/ChainsawCyclicBufferTableModel.java   |  2 +-
 .../apache/log4j/chainsaw/ChainsawStatusBar.java   |  6 ++--
 .../log4j/chainsaw/ChainsawToolBarAndMenus.java    |  1 +
 src/main/java/org/apache/log4j/chainsaw/LogUI.java |  1 +
 .../apache/log4j/chainsaw/LoggerNameTreePanel.java |  8 +++--
 .../apache/log4j/chainsaw/SmallToggleButton.java   |  2 +-
 .../log4j/chainsaw/TableColorizingRenderer.java    |  6 ++--
 .../apache/log4j/chainsaw/color/ColorPanel.java    |  2 +-
 .../{ => components/logpanel}/LogPanel.java        | 41 +++++++++++-----------
 .../logpanel}/LogPanelLoggerTreeModel.java         |  7 ++--
 .../logpanel}/LogPanelPreferenceModel.java         |  3 +-
 .../logpanel}/LogPanelPreferencePanel.java         | 12 ++++---
 13 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
index ccd04e7..f861a97 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
@@ -71,21 +71,21 @@ public class ChainsawConstants {
     static final String SETTINGS_EXTENSION = ".settings";
 
     //COLUMN NAMES
-    static final String LOGGER_COL_NAME = "LOGGER";
-    static final String LOG4J_MARKER_COL_NAME_LOWERCASE = "marker";
-    static final String TIMESTAMP_COL_NAME = "TIMESTAMP";
-    static final String LEVEL_COL_NAME = "LEVEL";
-    static final String THREAD_COL_NAME = "THREAD";
-    static final String MESSAGE_COL_NAME = "MESSAGE";
-    static final String NDC_COL_NAME = "NDC";
-    static final String THROWABLE_COL_NAME = "THROWABLE";
-    static final String CLASS_COL_NAME = "CLASS";
-    static final String METHOD_COL_NAME = "METHOD";
-    static final String FILE_COL_NAME = "FILE";
-    static final String LINE_COL_NAME = "LINE";
-    static final String PROPERTIES_COL_NAME = "PROPERTIES";
+    public static final String LOGGER_COL_NAME = "LOGGER";
+    public static final String LOG4J_MARKER_COL_NAME_LOWERCASE = "marker";
+    public static final String TIMESTAMP_COL_NAME = "TIMESTAMP";
+    public static final String LEVEL_COL_NAME = "LEVEL";
+    public static final String THREAD_COL_NAME = "THREAD";
+    public static final String MESSAGE_COL_NAME = "MESSAGE";
+    public static final String NDC_COL_NAME = "NDC";
+    public static final String THROWABLE_COL_NAME = "THROWABLE";
+    public static final String CLASS_COL_NAME = "CLASS";
+    public static final String METHOD_COL_NAME = "METHOD";
+    public static final String FILE_COL_NAME = "FILE";
+    public static final String LINE_COL_NAME = "LINE";
+    public static final String PROPERTIES_COL_NAME = "PROPERTIES";
     public static final String MILLIS_DELTA_COL_NAME_LOWERCASE = "millisdelta";
-    static final String ID_COL_NAME = "ID";
+    public static final String ID_COL_NAME = "ID";
 
     //none is not a real column name, but is used by filters as a way to apply no filter for colors or display
     static final String NONE_COL_NAME = "None";
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index 6bb5dea..b725f12 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -49,7 +49,7 @@ import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
  * @author Scott Deboy &lt;sdeboy@apache.org&gt;
  * @author Stephen Pain
  */
-class ChainsawCyclicBufferTableModel extends AbstractTableModel
+public class ChainsawCyclicBufferTableModel extends AbstractTableModel
     implements EventContainer, PropertyChangeListener {
 
     //cyclic field used internally in this class, but not exposed via the eventcontainer
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
index 033db22..ee155ec 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
@@ -231,7 +231,7 @@ public class ChainsawStatusBar extends JPanel {
         }
     }
 
-    void setSelectedLine(
+    public void setSelectedLine(
         final int selectedLine, final int lineCount, final int total, String tabName) {
         if (tabName.equals(logUI.getActiveTabName())) {
             SwingUtilities.invokeLater(
@@ -242,7 +242,7 @@ public class ChainsawStatusBar extends JPanel {
         }
     }
 
-    void setSearchMatchCount(int searchMatchCount, String tabName) {
+    public void setSearchMatchCount(int searchMatchCount, String tabName) {
         if (tabName.equals(logUI.getActiveTabName())) {
             if (searchMatchCount == 0) {
                 searchMatchLabel.setText("");
@@ -252,7 +252,7 @@ public class ChainsawStatusBar extends JPanel {
         }
     }
 
-    void setNothingSelected() {
+    public void setNothingSelected() {
         SwingUtilities.invokeLater(
             () -> lineSelectionLabel.setText(""));
     }
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
index 25d73e3..5f2edf3 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
@@ -17,6 +17,7 @@
 
 package org.apache.log4j.chainsaw;
 
+import org.apache.log4j.chainsaw.components.logpanel.LogPanel;
 import org.apache.log4j.chainsaw.filter.FilterModel;
 import org.apache.log4j.chainsaw.help.HelpManager;
 import org.apache.log4j.chainsaw.icons.ChainsawIcons;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index a28a6d2..2ee80b6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -20,6 +20,7 @@ package org.apache.log4j.chainsaw;
 import org.apache.commons.configuration2.AbstractConfiguration;
 import org.apache.commons.configuration2.event.ConfigurationEvent;
 import org.apache.log4j.chainsaw.color.RuleColorizer;
+import org.apache.log4j.chainsaw.components.logpanel.LogPanel;
 import org.apache.log4j.chainsaw.dnd.FileDnDTarget;
 import org.apache.log4j.chainsaw.help.HelpManager;
 import org.apache.log4j.chainsaw.helper.SwingHelper;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
index 2c4f581..b092ed8 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -18,6 +18,8 @@
  */
 package org.apache.log4j.chainsaw;
 
+import org.apache.log4j.chainsaw.components.logpanel.LogPanel;
+import org.apache.log4j.chainsaw.components.logpanel.LogPanelLoggerTreeModel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.log4j.chainsaw.color.RuleColorizer;
@@ -47,7 +49,7 @@ import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
  *
  * @author Paul Smith &lt;psmith@apache.org&gt;
  */
-final class LoggerNameTreePanel extends JPanel implements LoggerNameListener {
+public final class LoggerNameTreePanel extends JPanel implements LoggerNameListener {
     //~ Static fields/initializers ==============================================
 
     private static final int WARN_DEPTH = 4;
@@ -118,7 +120,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener {
      *
      * @param logTreeModel
      */
-    LoggerNameTreePanel(LogPanelLoggerTreeModel logTreeModel, 
+    public LoggerNameTreePanel(LogPanelLoggerTreeModel logTreeModel,
             AbstractConfiguration panelConfiguration,
             LogPanel logPanel,
             RuleColorizer colorizer,
@@ -549,7 +551,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener {
      *
      * @param fqnLoggersToIgnore
      */
-    void ignore(Collection fqnLoggersToIgnore) {
+    public void ignore(Collection fqnLoggersToIgnore) {
         hiddenSet.addAll(fqnLoggersToIgnore);
         visibilityRuleDelegate.firePropertyChange("hiddenSet", null, null);
         fireChangeEvent();
diff --git a/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java b/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
index f6531bc..b06b7b8 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
@@ -38,7 +38,7 @@ import java.awt.event.MouseListener;
  * @author Pavel Vorobeiv
  * @author Paul Smith &lt;psmith@apache.org&gt;
  */
-class SmallToggleButton extends JToggleButton implements ItemListener,
+public class SmallToggleButton extends JToggleButton implements ItemListener,
     MouseListener {
     protected Border m_highlighted = new SoftBevelBorder(BevelBorder.RAISED);
     protected Border m_raised = BorderFactory.createEmptyBorder(3, 3, 3, 3);
diff --git a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 964d6c7..09279d4 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -18,6 +18,7 @@
 package org.apache.log4j.chainsaw;
 
 import org.apache.log4j.chainsaw.color.RuleColorizer;
+import org.apache.log4j.chainsaw.components.logpanel.LogPanelPreferenceModel;
 import org.apache.log4j.chainsaw.icons.LevelIconFactory;
 import org.apache.log4j.helpers.Constants;
 import org.apache.log4j.rule.Rule;
@@ -34,7 +35,6 @@ import java.text.SimpleDateFormat;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -519,7 +519,7 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
      *
      * @param formatter
      */
-    void setDateFormatter(DateFormat formatter) {
+    public void setDateFormatter(DateFormat formatter) {
         this.dateFormatInUse = formatter;
         if (dateFormatInUse != null && dateFormatTZ != null && !("".equals(dateFormatTZ))) {
             dateFormatInUse.setTimeZone(TimeZone.getTimeZone(dateFormatTZ));
@@ -533,7 +533,7 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
      *
      * @param loggerPrecisionText
      */
-    void setLoggerPrecision(String loggerPrecisionText) {
+    public void setLoggerPrecision(String loggerPrecisionText) {
         try {
             loggerPrecision = Integer.parseInt(loggerPrecisionText);
         } catch (NumberFormatException nfe) {
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 1b6ca98..8ddcbee 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -42,7 +42,7 @@ import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableCellEditor;
 
 import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.log4j.chainsaw.LogPanel;
+import org.apache.log4j.chainsaw.components.logpanel.LogPanel;
 import org.apache.log4j.chainsaw.prefs.SettingsManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
similarity index 99%
rename from src/main/java/org/apache/log4j/chainsaw/LogPanel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
index df693d3..b46b284 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.logpanel;
 
 import org.apache.commons.configuration2.event.EventListener;
+import org.apache.log4j.chainsaw.*;
 import org.apache.log4j.chainsaw.color.ColorPanel;
 import org.apache.log4j.chainsaw.color.RuleColorizer;
 import org.apache.log4j.chainsaw.filter.FilterModel;
@@ -2212,7 +2213,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
     /**
      * Display the panel preferences frame
      */
-    void showPreferences() {
+    public void showPreferences() {
         //don't pack this frame
         centerAndSetVisible(logPanelPreferencesFrame);
     }
@@ -2227,7 +2228,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
     /**
      * Display the color rule frame
      */
-    void showColorPreferences() {
+    public void showColorPreferences() {
         colorPanel.componentChanged();
         colorFrame.pack();
         centerAndSetVisible(colorFrame);
@@ -2236,7 +2237,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
     /**
      * Toggle panel preference for detail visibility on or off
      */
-    void toggleDetailVisible() {
+    public void toggleDetailVisible() {
         AbstractConfiguration config = SettingsManager.getInstance().getSettingsForReceiverTab(identifier);
 
         boolean visible = config.getBoolean("logpanel.detailColumnVisible");
@@ -2248,7 +2249,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return detail visibility flag
      */
-    boolean isDetailVisible() {
+    public boolean isDetailVisible() {
         AbstractConfiguration config = SettingsManager.getInstance().getSettingsForReceiverTab(identifier);
 
         boolean visible = config.getBoolean("logpanel.detailColumnVisible");
@@ -2262,7 +2263,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
     /**
      * Toggle panel preference for logger tree visibility on or off
      */
-    void toggleLogTreeVisible() {
+    public void toggleLogTreeVisible() {
         AbstractConfiguration config = SettingsManager.getInstance().getSettingsForReceiverTab(identifier);
 
         boolean visible = config.getBoolean("logpanel.logTreePanelVisible");
@@ -2274,7 +2275,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return logger tree visibility flag
      */
-    boolean isLogTreeVisible() {
+    public boolean isLogTreeVisible() {
         AbstractConfiguration config = SettingsManager.getInstance().getSettingsForReceiverTab(identifier);
 
         return config.getBoolean("logpanel.logTreePanelVisible");
@@ -2294,18 +2295,18 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return list of LoggingEvents
      */
-    List getFilteredEvents() {
+    public List getFilteredEvents() {
         return tableModel.getFilteredEvents();
     }
 
-    List<LoggingEventWrapper> getMatchingEvents(Rule rule) {
+    public List<LoggingEventWrapper> getMatchingEvents(Rule rule) {
         return tableModel.getMatchingEvents(rule);
     }
 
     /**
      * Remove all events
      */
-    void clearEvents() {
+    public void clearEvents() {
         clearModel();
     }
 
@@ -2314,7 +2315,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return identifier
      */
-    String getIdentifier() {
+    public String getIdentifier() {
         return identifier;
     }
 
@@ -2322,7 +2323,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      * Undocks this DockablePanel by removing the panel from the LogUI window
      * and placing it inside it's own JFrame.
      */
-    void undock() {
+    public void undock() {
         final int row = table.getSelectedRow();
         setDocked(false);
         externalPanel.removeAll();
@@ -2345,7 +2346,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @param l
      */
-    void addEventCountListener(EventCountListener l) {
+    public void addEventCountListener(EventCountListener l) {
         tableModel.addEventCountListener(l);
     }
 
@@ -2354,7 +2355,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return paused flag
      */
-    boolean isPaused() {
+    public boolean isPaused() {
         return paused;
     }
 
@@ -2363,7 +2364,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @param paused
      */
-    void setPaused(boolean paused) {
+    public void setPaused(boolean paused) {
         boolean oldValue = this.paused;
         this.paused = paused;
         firePropertyChange("paused", oldValue, paused);
@@ -2375,7 +2376,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      * @param eventNumber
      * @return row number or -1 if row with log4jid property with that number was not found
      */
-    int setSelectedEvent(int eventNumber) {
+    public int setSelectedEvent(int eventNumber) {
         int row = tableModel.locate(ExpressionRule.getRule("prop.log4jid == " + eventNumber), 0, true);
         if (row > -1) {
             preferenceModel.setScrollToBottom(false);
@@ -2390,7 +2391,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @param listener
      */
-    void addPreferencePropertyChangeListener(PropertyChangeListener listener) {
+    public void addPreferencePropertyChangeListener(PropertyChangeListener listener) {
         preferenceModel.addPropertyChangeListener(listener);
     }
 
@@ -2398,7 +2399,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      * Toggle the LoggingEvent container from either managing a cyclic buffer of
      * events or an ArrayList of events
      */
-    void toggleCyclic() {
+    public void toggleCyclic() {
         boolean toggledCyclic = !preferenceModel.isCyclic();
 
         preferenceModel.setCyclic(toggledCyclic);
@@ -2411,7 +2412,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
      *
      * @return flag answering if LoggingEvent container is a cyclic buffer
      */
-    boolean isCyclic() {
+    public boolean isCyclic() {
         return preferenceModel.isCyclic();
     }
 
@@ -2732,7 +2733,7 @@ public class LogPanel extends DockablePanel implements ChainsawEventBatchListene
     /**
      * Update the status bar with current selected row and row count
      */
-    protected void updateStatusBar() {
+    public void updateStatusBar() {
         SwingHelper.invokeOnEDT(
             () -> {
                 statusBar.setSelectedLine(
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
similarity index 96%
rename from src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
index e7d3b9b..45aaf39 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
@@ -17,8 +17,9 @@
 
 /*
  */
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.logpanel;
 
+import org.apache.log4j.chainsaw.LoggerNameListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -34,7 +35,7 @@ import java.util.*;
  *
  * @author Paul Smith &lt;psmith@apache.org&gt;
  */
-class LogPanelLoggerTreeModel extends DefaultTreeModel
+public class LogPanelLoggerTreeModel extends DefaultTreeModel
     implements LoggerNameListener {
     private Map<String, LogPanelTreeNode> fullPackageMap = new HashMap<>();
     private final Logger logger = LogManager.getLogger(LogPanelLoggerTreeModel.class);
@@ -136,7 +137,7 @@ class LogPanelLoggerTreeModel extends DefaultTreeModel
         }
     }
 
-    LogPanelTreeNode lookupLogger(String newLogger) {
+    public LogPanelTreeNode lookupLogger(String newLogger) {
         if (fullPackageMap.containsKey(newLogger)) {
             return fullPackageMap.get(newLogger);
         } else {
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferenceModel.java
similarity index 99%
rename from src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferenceModel.java
index f563ad9..01dc095 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferenceModel.java
@@ -17,9 +17,8 @@
 
 /*
  */
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.logpanel;
 
-import org.apache.log4j.chainsaw.prefs.SettingsManager;
 import org.apache.log4j.helpers.Constants;
 
 import javax.swing.table.TableColumn;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferencePanel.java
similarity index 98%
rename from src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferencePanel.java
index 9629069..70abb08 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelPreferencePanel.java
@@ -14,13 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.log4j.chainsaw;
-
+package org.apache.log4j.chainsaw.components.logpanel;
+
+import org.apache.log4j.chainsaw.AbstractPreferencePanel;
+import org.apache.log4j.chainsaw.ApplicationPreferenceModel;
+import org.apache.log4j.chainsaw.BasicPrefPanel;
+import org.apache.log4j.chainsaw.CheckListCellRenderer;
+import org.apache.log4j.chainsaw.JTextComponentFormatter;
+import org.apache.log4j.chainsaw.ModifiableListModel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import javax.swing.*;
-import javax.swing.table.TableColumn;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
@@ -29,7 +34,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
 import org.apache.commons.configuration2.AbstractConfiguration;
 import org.apache.commons.configuration2.Configuration;