You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/08 21:11:12 UTC
svn commit: r1782258 -
/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
Author: pmouawad
Date: Wed Feb 8 21:11:12 2017
New Revision: 1782258
URL: http://svn.apache.org/viewvc?rev=1782258&view=rev
Log:
Rename var to make code clearer
Remove unused import
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1782258&r1=1782257&r2=1782258&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Wed Feb 8 21:11:12 2017
@@ -26,7 +26,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
import javax.swing.Timer;
import org.apache.commons.collections.buffer.BoundedFifoBuffer;
@@ -46,8 +45,9 @@ public class LoggerPanel extends JPanel
private final JTextArea textArea;
- // Limit length of log content
- private static final int LOGGER_PANEL_MAX_LENGTH =
+ // Limit length of log content
+ // 0 means unlimited
+ private static final int LOGGER_PANEL_MAX_LINES =
JMeterUtils.getPropDefault("jmeter.loggerpanel.maxlength", 1000); // $NON-NLS-1$
// Make panel handle event even if closed
@@ -58,7 +58,7 @@ public class LoggerPanel extends JPanel
JMeterUtils.getPropDefault("jmeter.loggerpanel.refresh_period", 500); // $NON-NLS-1$
private final BoundedFifoBuffer events =
- new BoundedFifoBuffer(valueOrMax(LOGGER_PANEL_MAX_LENGTH, 2000)); // $NON-NLS-1$
+ new BoundedFifoBuffer(valueOrMax(LOGGER_PANEL_MAX_LINES, 2000)); // $NON-NLS-1$
private volatile boolean logChanged = false;
@@ -146,7 +146,7 @@ public class LoggerPanel extends JPanel
String logText = builder.toString();
synchronized (textArea) {
int currentLength;
- if (LOGGER_PANEL_MAX_LENGTH > 0) {
+ if (LOGGER_PANEL_MAX_LINES > 0) {
textArea.setText(logText);
currentLength = logText.length();
} else {
Re: svn commit: r1782258 - /jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 8. Februar 2017 22:11:12 MEZ schrieb pmouawad@apache.org:
>Author: pmouawad
>Date: Wed Feb 8 21:11:12 2017
>New Revision: 1782258
>
>URL: http://svn.apache.org/viewvc?rev=1782258&view=rev
>Log:
>Rename var to make code clearer
>Remove unused import
>
>Modified:
> jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
>
>Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1782258&r1=1782257&r2=1782258&view=diff
>==============================================================================
>--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
>(original)
>+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Wed
>Feb 8 21:11:12 2017
>@@ -26,7 +26,6 @@ import javax.swing.JPanel;
> import javax.swing.JScrollPane;
> import javax.swing.JTextArea;
> import javax.swing.ScrollPaneConstants;
>-import javax.swing.SwingUtilities;
> import javax.swing.Timer;
>
> import org.apache.commons.collections.buffer.BoundedFifoBuffer;
>@@ -46,8 +45,9 @@ public class LoggerPanel extends JPanel
>
> private final JTextArea textArea;
>
>- // Limit length of log content
>- private static final int LOGGER_PANEL_MAX_LENGTH =
>+ // Limit length of log content
>+ // 0 means unlimited
>+ private static final int LOGGER_PANEL_MAX_LINES =
>JMeterUtils.getPropDefault("jmeter.loggerpanel.maxlength", 1000); //
>$NON-NLS-1$
Thanks for doing this. I am still undecided, if the old limit of bytes instead of lines should be enforced.
The byte limit would probably fit better with Vladimir's suggestion of replacing only a part of the logger panel content on update and would mean that we didn't change the limit on the outside.
Felix
>
> // Make panel handle event even if closed
>@@ -58,7 +58,7 @@ public class LoggerPanel extends JPanel
>JMeterUtils.getPropDefault("jmeter.loggerpanel.refresh_period", 500);
>// $NON-NLS-1$
>
> private final BoundedFifoBuffer events =
>- new BoundedFifoBuffer(valueOrMax(LOGGER_PANEL_MAX_LENGTH,
>2000)); // $NON-NLS-1$
>+ new BoundedFifoBuffer(valueOrMax(LOGGER_PANEL_MAX_LINES,
>2000)); // $NON-NLS-1$
>
> private volatile boolean logChanged = false;
>
>@@ -146,7 +146,7 @@ public class LoggerPanel extends JPanel
> String logText = builder.toString();
> synchronized (textArea) {
> int currentLength;
>- if (LOGGER_PANEL_MAX_LENGTH > 0) {
>+ if (LOGGER_PANEL_MAX_LINES > 0) {
> textArea.setText(logText);
> currentLength = logText.length();
> } else {