Author: pmouawad
Date: Fri Feb 10 14:59:41 2012
New Revision: 1242805
URL: http://svn.apache.org/viewvc?rev=1242805&view=rev
Log:
Bug 52639 - JSplitPane divider for log panel should be hidden if log is not
activated
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1242805&r1=1242804&r2=1242805&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Fri Feb 10
14:59:41 2012
@@ -420,7 +420,9 @@ public class MainFrame extends JFrame im
topAndDown.setResizeWeight(.8);
topAndDown.setContinuousLayout(true);
topAndDown.setBorder(null); // see bug jdk 4131528
-
+ if(!DISPLAY_LOGGER_PANEL) {
+ topAndDown.setDividerSize(0);
+ }
mainPanel = createMainPanel();
logPanel = createLoggerPanel();
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java?rev=1242805&r1=1242804&r2=1242805&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
Fri Feb 10 14:59:41 2012
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import javax.swing.JSplitPane;
+import javax.swing.UIManager;
import org.apache.jmeter.gui.GuiPackage;
@@ -60,15 +61,17 @@ public class LoggerPanelEnableDisable im
* the generic UI action event
*/
public void doAction(ActionEvent e) {
+ GuiPackage guiInstance = GuiPackage.getInstance();
+ JSplitPane splitPane =
((JSplitPane)guiInstance.getLoggerPanel().getParent());
if
(ActionNames.LOGGER_PANEL_ENABLE_DISABLE.equals(e.getActionCommand())) {
- GuiPackage guiInstance = GuiPackage.getInstance();
if (guiInstance.getMenuItemLoggerPanel().getModel().isSelected()) {
+
splitPane.setDividerSize(UIManager.getInt("SplitPane.dividerSize"));
guiInstance.getLoggerPanel().setVisible(true);
- JSplitPane splitPane =
((JSplitPane)guiInstance.getLoggerPanel().getParent());
splitPane.setDividerLocation(0.8);
} else {
guiInstance.getLoggerPanel().clear();
guiInstance.getLoggerPanel().setVisible(false);
+ splitPane.setDividerSize(0);
}
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1242805&r1=1242804&r2=1242805&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 10 14:59:41 2012
@@ -99,6 +99,7 @@ or a Debug Sampler with all fields set t
<h3>General</h3>
<ul>
+<li>Bug 52639 - JSplitPane divider for log panel should be hidden if log is
not activated</li>
</ul>
<!-- =================== Improvements =================== -->
