View | Details | Raw Unified | Return to bug 60203
Collapse All | Expand All

(-)a/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java (-14 / +15 lines)
Lines 27-33 import javax.swing.JPanel; Link Here
27
import org.apache.jmeter.assertions.XPathAssertion;
27
import org.apache.jmeter.assertions.XPathAssertion;
28
import org.apache.jmeter.testelement.TestElement;
28
import org.apache.jmeter.testelement.TestElement;
29
import org.apache.jmeter.util.JMeterUtils;
29
import org.apache.jmeter.util.JMeterUtils;
30
import org.apache.jorphan.gui.layout.VerticalLayout;
31
30
32
public class XPathAssertionGui extends AbstractAssertionGui {
31
public class XPathAssertionGui extends AbstractAssertionGui {
33
32
Lines 76-89 public class XPathAssertionGui extends AbstractAssertionGui { Link Here
76
    }
75
    }
77
76
78
    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
77
    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
79
        setLayout(new VerticalLayout(5, VerticalLayout.BOTH, VerticalLayout.TOP));
78
        setLayout(new BorderLayout());
80
        setBorder(makeBorder());
79
        setBorder(makeBorder());
81
80
82
        add(makeTitlePanel());
81
        Box topBox = Box.createVerticalBox();
83
        Box box = Box.createVerticalBox();
82
84
        box.add(createScopePanel(true));
83
        topBox.add(makeTitlePanel());
85
        add(box);
84
86
        
85
        topBox.add(createScopePanel(true));
86
87
        xml = new XMLConfPanel();
88
        xml.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
89
                .getResString("xpath_assertion_option"))); //$NON-NLS-1$
90
        topBox.add(xml);
91
92
        add(topBox, BorderLayout.NORTH);
93
87
        // USER_INPUT
94
        // USER_INPUT
88
        JPanel sizePanel = new JPanel(new BorderLayout());
95
        JPanel sizePanel = new JPanel(new BorderLayout());
89
        sizePanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
96
        sizePanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
Lines 91-103 public class XPathAssertionGui extends AbstractAssertionGui { Link Here
91
                getXPathAttributesTitle()));
98
                getXPathAttributesTitle()));
92
        xpath = new XPathPanel();
99
        xpath = new XPathPanel();
93
        sizePanel.add(xpath);
100
        sizePanel.add(xpath);
94
101
        add(sizePanel, BorderLayout.CENTER);
95
        xml = new XMLConfPanel();
96
        xml.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
97
                .getResString("xpath_assertion_option"))); //$NON-NLS-1$
98
        add(xml);
99
100
        add(sizePanel);
101
    }
102
    }
102
103
103
    /**
104
    /**
(-)a/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java (-7 / +8 lines)
Lines 20-25 package org.apache.jmeter.assertions.gui; Link Here
20
20
21
import java.awt.event.ActionEvent;
21
import java.awt.event.ActionEvent;
22
import java.awt.event.ActionListener;
22
import java.awt.event.ActionListener;
23
import java.awt.BorderLayout;
23
24
24
import javax.swing.Box;
25
import javax.swing.Box;
25
import javax.swing.JButton;
26
import javax.swing.JButton;
Lines 62-79 public class XPathPanel extends JPanel { Link Here
62
    }
63
    }
63
64
64
    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
65
    private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
66
        setLayout(new BorderLayout());
67
65
        Box hbox = Box.createHorizontalBox();
68
        Box hbox = Box.createHorizontalBox();
69
66
        hbox.add(Box.createHorizontalGlue());
70
        hbox.add(Box.createHorizontalGlue());
67
        hbox.add(JTextScrollPane.getInstance(getXPathField()));
71
        hbox.add(getNegatedCheckBox());
68
        hbox.add(Box.createHorizontalGlue());
72
        hbox.add(Box.createHorizontalGlue());
69
        hbox.add(getCheckXPathButton());
73
        hbox.add(getCheckXPathButton());
74
        hbox.add(Box.createHorizontalGlue());
70
75
71
        Box vbox = Box.createVerticalBox();
76
        add(JTextScrollPane.getInstance(getXPathField()), BorderLayout.CENTER);
72
        vbox.add(hbox);
77
        add(hbox, BorderLayout.SOUTH);
73
        vbox.add(Box.createVerticalGlue());
74
        vbox.add(getNegatedCheckBox());
75
76
        add(vbox);
77
78
78
        setDefaultValues();
79
        setDefaultValues();
79
    }
80
    }

Return to bug 60203