moved loggername panel to its own package
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index a4378c9..455a1a9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -18,6 +18,9 @@
package org.apache.log4j.chainsaw;
import org.apache.log4j.chainsaw.color.RuleColorizer;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameListener;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModelSupport;
import org.apache.log4j.chainsaw.helper.SwingHelper;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
import org.apache.log4j.helpers.Constants;
diff --git a/src/main/java/org/apache/log4j/chainsaw/EventContainer.java b/src/main/java/org/apache/log4j/chainsaw/EventContainer.java
index e4c2c27..e534103 100644
--- a/src/main/java/org/apache/log4j/chainsaw/EventContainer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/EventContainer.java
@@ -17,6 +17,7 @@
package org.apache.log4j.chainsaw;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel;
import org.apache.log4j.rule.Rule;
import java.beans.PropertyChangeListener;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameListener.java
similarity index 95%
rename from src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
rename to src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameListener.java
index a182b4e..1a93335 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.loggernamepanel;
import java.util.EventListener;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModel.java
similarity index 96%
rename from src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModel.java
index a48b634..57dac8a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModel.java
@@ -17,7 +17,7 @@
/*
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.loggernamepanel;
import java.util.Collection;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModelSupport.java
similarity index 80%
rename from src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
rename to src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModelSupport.java
index 815e047..1262d1e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameModelSupport.java
@@ -17,7 +17,7 @@
/*
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.loggernamepanel;
import javax.swing.event.EventListenerList;
import java.util.Collection;
@@ -38,14 +38,14 @@
/* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.LoggerNameModel#getLoggerNames()
+ * @see org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel#getLoggerNames()
*/
public Collection<String> getLoggerNames() {
return Collections.unmodifiableSet(loggerNameSet);
}
/* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.LoggerNameModel#addLoggerName(java.lang.String)
+ * @see org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel#addLoggerName(java.lang.String)
*/
public boolean addLoggerName(String loggerName) {
boolean isNew = loggerNameSet.add(loggerName);
@@ -81,14 +81,14 @@
}
/* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.LoggerNameModel#addLoggerNameListener(org.apache.log4j.chainsaw.LoggerNameListener)
+ * @see org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel#addLoggerNameListener(org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameListener)
*/
public void addLoggerNameListener(LoggerNameListener l) {
listenerList.add(LoggerNameListener.class, l);
}
/* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.LoggerNameModel#removeLoggerNameListener(org.apache.log4j.chainsaw.LoggerNameListener)
+ * @see org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameModel#removeLoggerNameListener(org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameListener)
*/
public void removeLoggerNameListener(LoggerNameListener l) {
listenerList.remove(LoggerNameListener.class, l);
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameTreePanel.java
similarity index 99%
rename from src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
rename to src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameTreePanel.java
index 6b45635..b9c1af5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/loggernamepanel/LoggerNameTreePanel.java
@@ -16,8 +16,12 @@
*/
/*
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.loggernamepanel;
+import org.apache.log4j.chainsaw.ChainsawConstants;
+import org.apache.log4j.chainsaw.ExpressionRuleContext;
+import org.apache.log4j.chainsaw.JTextComponentFormatter;
+import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.components.elements.SmallToggleButton;
import org.apache.log4j.chainsaw.components.logpanel.LogPanel;
@@ -41,7 +45,7 @@
import java.awt.event.*;
import java.util.*;
import java.util.List;
-import org.apache.commons.configuration2.AbstractConfiguration;
+
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
diff --git a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
index 7be60df..1cc8865 100644
--- a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java
@@ -17,14 +17,13 @@
package org.apache.log4j.chainsaw.components.logpanel;
-import org.apache.commons.configuration2.event.Event;
-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.components.elements.sorttable.JSortTable;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.components.elements.SmallToggleButton;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameTreePanel;
import org.apache.log4j.chainsaw.filter.FilterModel;
import org.apache.log4j.chainsaw.helper.SwingHelper;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
diff --git a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
index 91342ab..6be15a7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanelLoggerTreeModel.java
@@ -19,7 +19,7 @@
*/
package org.apache.log4j.chainsaw.components.logpanel;
-import org.apache.log4j.chainsaw.LoggerNameListener;
+import org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameListener;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -45,7 +45,7 @@
}
/* (non-Javadoc)
- * @see org.apache.log4j.chainsaw.LoggerNameListener#loggerNameAdded(java.lang.String)
+ * @see org.apache.log4j.chainsaw.components.loggernamepanel.LoggerNameListener#loggerNameAdded(java.lang.String)
*/
public void loggerNameAdded(final String loggerName) {
//invoke later, not on current EDT
