moved cyclicBufferSize to the place where it is actually needed
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
index 5f31e45..1b5ee80 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStarter.java
@@ -96,8 +96,6 @@
if (configuration.getBoolean("slowSplash", true)) {
splashViewer.showSplash(logUI);
}
- logUI.cyclicBufferSize = configuration.getInt("cyclicBufferSize", 50000);
-
/**
* TODO until we work out how JoranConfigurator might be able to have
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 293f698..e8df0a0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -28,9 +28,7 @@
import org.apache.log4j.chainsaw.components.welcome.WelcomePanel;
import org.apache.log4j.chainsaw.dnd.FileDnDTarget;
import org.apache.log4j.chainsaw.help.HelpManager;
-import org.apache.log4j.chainsaw.helper.SwingHelper;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
-import org.apache.log4j.chainsaw.icons.LineIconFactory;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
import org.apache.log4j.chainsaw.osx.OSXIntegration;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
@@ -44,8 +42,6 @@
import org.apache.logging.log4j.Logger;
import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -112,7 +108,6 @@
private SettingsManager settingsManager;
private double lastMainReceiverSplitLocation = DEFAULT_MAIN_RECEIVER_SPLIT_LOCATION;
private int dividerSize;
- public int cyclicBufferSize;
private List<ChainsawReceiver> receivers = new ArrayList<>();
private List<ReceiverEventListener> receiverListeners = new ArrayList<>();
private ZeroConfPlugin zeroConf = new ZeroConfPlugin(settingsManager);
@@ -139,6 +134,7 @@
this.settingsManager = settingsManager;
this.configuration = settingsManager.getGlobalConfiguration();
+
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
globalRuleColorizer.setConfiguration(configuration);
@@ -151,7 +147,6 @@
shutdownManager = new ShutdownManager(this, configuration, receivers, shutdownListenerList);
}
-
/**
* Registers a ShutdownListener with this class so that it can be notified
* when the user has requested that Chainsaw exit.
@@ -752,7 +747,7 @@
private void buildLogPanel(boolean customExpression, final String ident, final ChainsawReceiver rx)
throws IllegalArgumentException {
- final LogPanel thisPanel = new LogPanel(settingsManager, getStatusBar(), ident, cyclicBufferSize, allColorizers, globalRuleColorizer);
+ final LogPanel thisPanel = new LogPanel(settingsManager, getStatusBar(), ident, allColorizers, globalRuleColorizer);
if (!customExpression && rx != null) {
thisPanel.setReceiver(rx);
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 395249e..0ff68c8 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
@@ -196,7 +196,6 @@
*/
public LogPanel(SettingsManager settingsManager, final ChainsawStatusBar statusBar,
final String identifier,
- int cyclicBufferSize,
Map<String, RuleColorizer> allColorizers,
RuleColorizer globalRuleColorizer) {
this.settingsManager = settingsManager;
@@ -572,6 +571,8 @@
/*
*End of preferenceModel listeners
*/
+
+ int cyclicBufferSize = settingsManager.getGlobalConfiguration().getInt("cyclicBufferSize", 50000);
tableModel = new ChainsawCyclicBufferTableModel(cyclicBufferSize, colorizer, "main");
table = new JSortTable(tableModel);
