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/12/17 14:23:50 UTC
(logging-chainsaw) branch master updated: migrated LogUI to a separate 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 d3a724f migrated LogUI to a separate package
d3a724f is described below
commit d3a724fe10793fd3ea1d7573c28eb4afbf36ae5e
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Dec 17 15:23:44 2023 +0100
migrated LogUI to a separate package
---
.../log4j/chainsaw/ApplicationPreferenceModelPanel.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java | 6 ++++--
src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java | 2 +-
.../java/org/apache/log4j/chainsaw/ChainsawStatusBar.java | 1 +
.../org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java | 9 +++++----
.../apache/log4j/chainsaw/CopyEventsToClipboardAction.java | 1 +
src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java | 2 ++
.../log4j/chainsaw/components/tutorial/TutorialFrame.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/file/FileMenu.java | 5 +----
.../java/org/apache/log4j/chainsaw/file/FileSaveAction.java | 2 +-
.../java/org/apache/log4j/chainsaw/{ => logui}/LogUI.java | 11 ++++++-----
.../log4j/chainsaw/{ => logui}/LogUiKeyStrokeCreator.java | 2 +-
.../log4j/chainsaw/{ => logui}/LogUiReceiversPanel.java | 3 ++-
.../java/org/apache/log4j/chainsaw/osx/OSXIntegration.java | 2 +-
.../org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 2 +-
.../org/apache/log4j/chainsaw/help/release-notes.html | 5 ++++-
src/main/resources/org/apache/log4j/chainsaw/package.html | 4 ++--
17 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
index 046b764..07cabf5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
@@ -49,7 +49,7 @@ public class ApplicationPreferenceModelPanel extends AbstractPreferencePanel {
private AbstractConfiguration m_globalConfiguration;
private SettingsManager settingsManager;
- ApplicationPreferenceModelPanel(SettingsManager settingsManager) {
+ public ApplicationPreferenceModelPanel(SettingsManager settingsManager) {
this.m_globalConfiguration = settingsManager.getGlobalConfiguration();
this.settingsManager = settingsManager;
initComponents();
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
index 643e3b1..88dc86a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
@@ -21,6 +21,8 @@ import org.apache.log4j.chainsaw.help.HelpManager;
import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import java.awt.*;
+
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -29,7 +31,7 @@ import org.apache.logging.log4j.Logger;
*
* @author Paul Smith <psmith@apache.org>
*/
-class ChainsawAbout extends JDialog {
+public class ChainsawAbout extends JDialog {
private static final Logger LOG = LogManager.getLogger();
private final JEditorPane editPane = new JEditorPane("text/html", "");
@@ -45,7 +47,7 @@ class ChainsawAbout extends JDialog {
private final Object guard = new Object();
- ChainsawAbout(LogUI logUI) {
+ public ChainsawAbout(LogUI logUI) {
super(logUI, "About Chainsaw v2", true);
// setResizable(false);
setBackground(Color.white);
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
index 1b5ee80..a8c8c5b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
@@ -1,6 +1,7 @@
package org.apache.log4j.chainsaw;
import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.osx.OSXIntegration;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.chainsaw.components.splash.SplashViewer;
@@ -10,7 +11,6 @@ import org.apache.logging.log4j.core.LoggerContext;
import javax.swing.*;
import java.awt.*;
-import java.awt.event.ActionEvent;
import java.security.AllPermission;
import java.security.CodeSource;
import java.security.PermissionCollection;
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
index ee155ec..013e729 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
@@ -18,6 +18,7 @@
package org.apache.log4j.chainsaw;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.logui.LogUI;
import javax.swing.*;
import javax.swing.border.Border;
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
index 658e7c5..88d0b24 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
@@ -26,6 +26,7 @@ import org.apache.log4j.chainsaw.file.FileMenu;
import org.apache.log4j.chainsaw.filter.FilterModel;
import org.apache.log4j.chainsaw.help.HelpManager;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.osx.OSXIntegration;
import javax.swing.*;
@@ -46,7 +47,7 @@ import java.util.List;
* @author Paul Smith <psmith@apache.org>
* @author Scott Deboy <sdeboy@apache.org>
*/
-class ChainsawToolBarAndMenus implements ChangeListener {
+public class ChainsawToolBarAndMenus implements ChangeListener {
private final SmallToggleButton showReceiversButton;
private final Action changeModelAction;
private final Action clearAction;
@@ -99,7 +100,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
private final Action[] logPanelSpecificActions;
private final JMenu activeTabMenu = new JMenu("Current tab");
- ChainsawToolBarAndMenus(final LogUI logui, AbstractConfiguration configuration) {
+ public ChainsawToolBarAndMenus(final LogUI logui, AbstractConfiguration configuration) {
this.logui = logui;
this.configuration = configuration;
toolbar = new JToolBar(SwingConstants.HORIZONTAL);
@@ -333,11 +334,11 @@ class ChainsawToolBarAndMenus implements ChangeListener {
scanState();
}
- JMenuBar getMenubar() {
+ public JMenuBar getMenubar() {
return menuBar;
}
- JToolBar getToolbar() {
+ public JToolBar getToolbar() {
return toolbar;
}
diff --git a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
index 0d40f09..42125ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
@@ -16,6 +16,7 @@ import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.util.List;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
+import org.apache.log4j.chainsaw.logui.LogUI;
public class CopyEventsToClipboardAction extends AbstractAction {
diff --git a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
index d334e5f..1628052 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
@@ -16,6 +16,8 @@
*/
package org.apache.log4j.chainsaw;
+import org.apache.log4j.chainsaw.logui.LogUI;
+
import java.util.EventListener;
/**
diff --git a/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
index 96cb22c..aa210bc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
@@ -3,7 +3,7 @@ package org.apache.log4j.chainsaw.components.tutorial;
import org.apache.log4j.chainsaw.ChainsawConstants;
import org.apache.log4j.chainsaw.ChainsawStatusBar;
import org.apache.log4j.chainsaw.JTextComponentFormatter;
-import org.apache.log4j.chainsaw.LogUI;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.ReceiverEventListener;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.components.elements.SmallToggleButton;
diff --git a/src/main/java/org/apache/log4j/chainsaw/file/FileMenu.java b/src/main/java/org/apache/log4j/chainsaw/file/FileMenu.java
index 2ab099f..7cb926c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/file/FileMenu.java
+++ b/src/main/java/org/apache/log4j/chainsaw/file/FileMenu.java
@@ -21,12 +21,9 @@
*/
package org.apache.log4j.chainsaw.file;
-import org.apache.log4j.chainsaw.LogUI;
-import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.osx.OSXIntegration;
import org.apache.log4j.chainsaw.prefs.MRUFileList;
-import org.apache.log4j.xml.UtilLoggingXMLDecoder;
-import org.apache.log4j.xml.XMLDecoder;
import javax.swing.*;
import java.awt.*;
diff --git a/src/main/java/org/apache/log4j/chainsaw/file/FileSaveAction.java b/src/main/java/org/apache/log4j/chainsaw/file/FileSaveAction.java
index 1b6c1f6..079f335 100644
--- a/src/main/java/org/apache/log4j/chainsaw/file/FileSaveAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/file/FileSaveAction.java
@@ -17,7 +17,7 @@
package org.apache.log4j.chainsaw.file;
-import org.apache.log4j.chainsaw.LogUI;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.LoggingEventWrapper;
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/LogUI.java
similarity index 99%
rename from src/main/java/org/apache/log4j/chainsaw/LogUI.java
rename to src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java
index 9365cc8..c207f7f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.logui;
import org.apache.commons.configuration2.AbstractConfiguration;
import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.log4j.chainsaw.*;
import org.apache.log4j.chainsaw.color.RuleColorizer;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.components.elements.TabIconHandler;
@@ -531,7 +532,7 @@ public class LogUI extends JFrame {
return shutdownManager.shutdown();
}
- void addWelcomePanel() {
+ public void addWelcomePanel() {
getTabbedPane().insertTab(
ChainsawTabbedPane.WELCOME_TAB, new ImageIcon(ChainsawIcons.ABOUT), welcomePanel,
"Welcome/Help", 0);
@@ -539,7 +540,7 @@ public class LogUI extends JFrame {
panelMap.put(ChainsawTabbedPane.WELCOME_TAB, welcomePanel);
}
- void removeWelcomePanel() {
+ public void removeWelcomePanel() {
EventQueue.invokeLater(() -> {
if (getTabbedPane().containsWelcomePanel()) {
getTabbedPane().remove(
@@ -548,7 +549,7 @@ public class LogUI extends JFrame {
});
}
- ChainsawStatusBar getStatusBar() {
+ public ChainsawStatusBar getStatusBar() {
return statusBar;
}
@@ -647,7 +648,7 @@ public class LogUI extends JFrame {
() -> statusBar.setVisible(visible));
}
- boolean isStatusBarVisible() {
+ public boolean isStatusBarVisible() {
return statusBar.isVisible();
}
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUiKeyStrokeCreator.java b/src/main/java/org/apache/log4j/chainsaw/logui/LogUiKeyStrokeCreator.java
similarity index 98%
rename from src/main/java/org/apache/log4j/chainsaw/LogUiKeyStrokeCreator.java
rename to src/main/java/org/apache/log4j/chainsaw/logui/LogUiKeyStrokeCreator.java
index dff2ce7..57003fd 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUiKeyStrokeCreator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/logui/LogUiKeyStrokeCreator.java
@@ -1,4 +1,4 @@
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.logui;
import org.apache.log4j.chainsaw.components.tabbedpane.ChainsawTabbedPane;
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUiReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/logui/LogUiReceiversPanel.java
similarity index 97%
rename from src/main/java/org/apache/log4j/chainsaw/LogUiReceiversPanel.java
rename to src/main/java/org/apache/log4j/chainsaw/logui/LogUiReceiversPanel.java
index b0cc555..0b9c3c0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUiReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/logui/LogUiReceiversPanel.java
@@ -1,7 +1,8 @@
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.logui;
import org.apache.commons.configuration2.AbstractConfiguration;
import org.apache.commons.configuration2.event.ConfigurationEvent;
+import org.apache.log4j.chainsaw.ChainsawStatusBar;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.chainsaw.receiver.ChainsawReceiver;
import org.apache.log4j.chainsaw.receivers.ReceiversPanel;
diff --git a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
index a5def17..ed6d736 100644
--- a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
+++ b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
@@ -16,7 +16,7 @@
*/
package org.apache.log4j.chainsaw.osx;
-import org.apache.log4j.chainsaw.LogUI;
+import org.apache.log4j.chainsaw.logui.LogUI;
import java.awt.Desktop;
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index ce8faa0..b71db59 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -20,7 +20,7 @@ package org.apache.log4j.chainsaw.receivers;
import org.apache.log4j.chainsaw.receiver.ChainsawReceiver;
import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory;
import org.apache.log4j.chainsaw.ChainsawStatusBar;
-import org.apache.log4j.chainsaw.LogUI;
+import org.apache.log4j.chainsaw.logui.LogUI;
import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.help.HelpManager;
diff --git a/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html b/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
index 9262de8..cfa6d91 100644
--- a/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
+++ b/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
@@ -121,7 +121,10 @@
</ul>
<h2>20 May 2010</h2>
<ul>
-<li>For users who would like to specify the Chainsaw configuration file from the command line, specify the URL to a configuration file as the first argument to Chainsaw (will bypass the the initial use of the automatic configuration URL mechanism). Example: java -classpath {classpath here} org.apache.log4j.chainsaw.LogUI file:///c:/downloads/tools/log4j/config/log4j.xml</li>
+<li>For users who would like to specify the Chainsaw configuration file from the command line, specify the URL to a
+ configuration file as the first argument to Chainsaw (will bypass the the initial use of the automatic configuration
+ URL mechanism). Example: java -classpath {classpath here} org.apache.log4j.chainsaw.logui.LogUI
+ file:///c:/downloads/tools/log4j/config/log4j.xml</li>
</ul>
<h2>13 May 2010</h2>
<ul>
diff --git a/src/main/resources/org/apache/log4j/chainsaw/package.html b/src/main/resources/org/apache/log4j/chainsaw/package.html
index 4399994..830db49 100644
--- a/src/main/resources/org/apache/log4j/chainsaw/package.html
+++ b/src/main/resources/org/apache/log4j/chainsaw/package.html
@@ -77,7 +77,7 @@ displays them in a table. The events can be filtered based on:</P>
<P>The command line usage is:</P>
- <PRE> java -D<property>=<value> org.apache.log4j.chainsaw.LogUI </PRE>
+ <PRE> java -D<property>=<value> org.apache.log4j.chainsaw.logui.LogUI </PRE>
<H2>Configuring Log4J</H2>
@@ -89,4 +89,4 @@ displays them in a table. The events can be filtered based on:</P>
</body>
-</html>
\ No newline at end of file
+</html>