You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2003/04/23 16:23:09 UTC
cvs commit: jakarta-jmeter/src/protocol/jndi/control/gui JndiTestSampleGui.java
mstover1 2003/04/23 07:23:09
Modified: src/components/org/apache/jmeter/visualizers
MailerVisualizer.java SimpleDataWriter.java
SplineVisualizer.java TableVisualizer.java
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter/config/gui LoginConfigGui.java
src/core/org/apache/jmeter/control/gui
LogicControllerGui.java LoopControlPanel.java
TestPlanGui.java WorkBenchGui.java
src/core/org/apache/jmeter/gui
AbstractJMeterGuiComponent.java MainFrame.java
src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui
FtpConfigGui.java
src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui
FtpTestSamplerGui.java
src/protocol/http/org/apache/jmeter/protocol/http/config/gui
HttpDefaultsGui.java
src/protocol/http/org/apache/jmeter/protocol/http/control/gui
SoapSamplerGui.java
src/protocol/http/org/apache/jmeter/protocol/http/gui
AuthPanel.java CookiePanel.java HeaderPanel.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui
AnchorModifierGui.java ParamModifierGui.java
URLRewritingModifierGui.java
UserParameterModifierGui.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
src/protocol/java/org/apache/jmeter/protocol/java/control/gui
JavaTestSamplerGui.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui
DbConfigGui.java PoolConfigGui.java
SqlConfigGui.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control/gui
JdbcTestSampleGui.java
src/protocol/jndi/config/gui JndiConfigGui.java
src/protocol/jndi/control/gui JndiTestSampleGui.java
Log:
Refactoring title creation to AbstractJMeterGUIComponent.
Refactoring Result tree visualizer a bit.
Fixed bug # 12427
Revision Changes Path
1.10 +3 -13 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MailerVisualizer.java 5 Feb 2003 05:12:03 -0000 1.9
+++ MailerVisualizer.java 23 Apr 2003 14:23:03 -0000 1.10
@@ -56,7 +56,6 @@
import java.awt.BorderLayout;
-import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -194,17 +193,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(getStaticLabel());
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
-
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// mailer panel
JPanel mailerPanel = new JPanel();
1.2 +3 -18 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
Index: SimpleDataWriter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleDataWriter.java 13 Feb 2003 21:35:29 -0000 1.1
+++ SimpleDataWriter.java 23 Apr 2003 14:23:05 -0000 1.2
@@ -56,9 +56,7 @@
import java.awt.BorderLayout;
-import java.awt.Font;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -122,21 +120,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- //JLabel panelTitleLabel = new JLabel("Simple Data Writer");
- JLabel panelTitleLabel =
- new JLabel(JMeterUtils.getResString("simple_data_writer_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
-
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(),
- curFont.getStyle(),
- curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
mainPanel.add(getFilePanel());
this.add(mainPanel, BorderLayout.NORTH);
1.7 +5 -15 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Index: SplineVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SplineVisualizer.java 26 Mar 2003 15:19:23 -0000 1.6
+++ SplineVisualizer.java 23 Apr 2003 14:23:05 -0000 1.7
@@ -57,7 +57,6 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.Graphics;
import java.awt.GridLayout;
import java.awt.Image;
@@ -185,17 +184,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("spline_visualizer_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
-
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
mainPanel.add(getFilePanel());
maximumLabel = new JLabel(JMeterUtils.getResString("spline_visualizer_maximum"));
maximumLabel.setForeground(MAXIMUM_COLOR);
1.7 +2 -12 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Index: TableVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableVisualizer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TableVisualizer.java 26 Mar 2003 15:19:23 -0000 1.6
+++ TableVisualizer.java 23 Apr 2003 14:23:05 -0000 1.7
@@ -57,7 +57,6 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.FlowLayout;
-import java.awt.Font;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
@@ -197,17 +196,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("view_results_in_table"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
-
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
mainPanel.add(getFilePanel());
// Set up the table itself
1.19 +77 -114 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ViewResultsFullVisualizer.java 22 Apr 2003 22:26:56 -0000 1.18
+++ ViewResultsFullVisualizer.java 23 Apr 2003 14:23:05 -0000 1.19
@@ -54,7 +54,6 @@
*/
package org.apache.jmeter.visualizers;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -90,10 +89,10 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.gui.JLabeledTextArea;
+import org.apache.jorphan.gui.layout.VerticalLayout;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
-
/****************************************
* Allows the tester to view the textual response from sampling an Entry. This
* also allows to "single step through" the sampling process via a nice
@@ -103,8 +102,7 @@
*@created 2001/07/25
*@version $Revision$ $Date$
***************************************/
-public class ViewResultsFullVisualizer extends AbstractVisualizer
- implements ActionListener, TreeSelectionListener, Clearable
+public class ViewResultsFullVisualizer extends AbstractVisualizer implements ActionListener, TreeSelectionListener, Clearable
{
public final static Color SERVER_ERROR_COLOR = Color.red;
public final static Color CLIENT_ERROR_COLOR = Color.blue;
@@ -115,6 +113,7 @@
protected DefaultTreeModel treeModel;
protected GridBagLayout gridBag;
protected GridBagConstraints gbc;
+ private JScrollPane textScrollArea;
/** The button that will pop up the response as rendered HTML or
text. **/
@@ -125,17 +124,18 @@
/** The pane where the rendered HTML response is displayed. **/
transient protected JEditorPane htmlEditPane;
-
- protected JPanel resultPanel;
private JSplitPane treeSplitPane;
-
+
/** The text area where the response is displayed. **/
protected JTextArea textArea;
protected JTree jTree;
protected int childIndex;
- transient private static Logger log =
- Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ transient private static Logger log = Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
+ private JLabel loadTimeLabel;
+ private JLabeledTextArea postDataField;
+ private JLabel responseCodeLabel;
+ private JLabel responseMsgLabel;
/****************************************
* !ToDo (Constructor description)
***************************************/
@@ -172,8 +172,7 @@
log.debug("End : updateGui1");
}
- private void addSubResults(DefaultMutableTreeNode currNode,
- SampleResult res)
+ private void addSubResults(DefaultMutableTreeNode currNode, SampleResult res)
{
SampleResult[] subResults = res.getSubResults();
@@ -205,12 +204,11 @@
if (log.isDebugEnabled())
log.debug("clear1 : total child - " + totalChild);
- for (int i = 0; i < totalChild; i++) // the child to be removed will always be 0 'cos as the nodes are removed
- // the nth node will become (n-1)th
- treeModel.removeNodeFromParent(
- (DefaultMutableTreeNode) root.getChildAt(0));
- resultPanel.removeAll();
- resultPanel.revalidate();
+ for (int i = 0; i < totalChild; i++) // the child to be removed will always be 0 'cos as the nodes are removed
+ // the nth node will become (n-1)th
+ treeModel.removeNodeFromParent((DefaultMutableTreeNode) root.getChildAt(0));
+ textArea.setText("");
+ textScrollArea.setViewportView(textArea);
// reset the child index
childIndex = 0;
log.debug("End : clear1");
@@ -238,29 +236,28 @@
public void valueChanged(TreeSelectionEvent e)
{
log.debug("Start : valueChanged1");
- DefaultMutableTreeNode node =
- (DefaultMutableTreeNode) jTree.getLastSelectedPathComponent();
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode) jTree.getLastSelectedPathComponent();
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled())
+ {
log.debug("valueChanged : selected node - " + node);
}
-
+
if (node != null)
{
SampleResult res = (SampleResult) node.getUserObject();
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled())
+ {
log.debug("valueChanged1 : sample result - " + res);
}
-
+
if (res != null)
{
- resultPanel.removeAll();
// load time label
- JLabel loadTime = new JLabel();
log.debug("valueChanged1 : load time - " + res.getTime());
- loadTime.setText("Load time : " + res.getTime());
+ loadTimeLabel.setText("Load time : " + res.getTime());
gbc.gridx = 0;
gbc.gridy = 0;
// keep all of the labels to the left
@@ -271,18 +268,11 @@
gbc.insets = new Insets(0, 10, 0, 0);
if (res != null && res.getSamplerData() != null)
{
- JLabeledTextArea postData =
- new JLabeledTextArea(
- JMeterUtils.getResString("request_data"),
- null);
-
- postData.setText(res.getSamplerData().toString());
- resultPanel.add(postData, gbc.clone());
- gbc.gridy++;
+
+ postDataField.setText(res.getSamplerData().toString());
}
- resultPanel.add(loadTime, gbc.clone());
// response code label
- JLabel httpResponseCode = new JLabel();
+
String responseCode = res.getResponseCode();
log.debug("valueChanged1 : response code - " + responseCode);
@@ -294,43 +284,33 @@
responseLevel = Integer.parseInt(responseCode) / 100;
}
catch (NumberFormatException numberFormatException)
- {// no need to change the foreground color
+ {
+ // no need to change the foreground color
}
switch (responseLevel)
{
- case 3:
- httpResponseCode.setForeground(REDIRECT_COLOR);
+ case 3 :
+ responseCodeLabel.setForeground(REDIRECT_COLOR);
- case 4:
- httpResponseCode.setForeground(CLIENT_ERROR_COLOR);
+ case 4 :
+ responseCodeLabel.setForeground(CLIENT_ERROR_COLOR);
- case 5:
- httpResponseCode.setForeground(SERVER_ERROR_COLOR);
+ case 5 :
+ responseCodeLabel.setForeground(SERVER_ERROR_COLOR);
}
- httpResponseCode.setText(
- JMeterUtils.getResString("HTTP response code") + " : " + responseCode);
- gbc.gridx = 0;
- gbc.gridy++;
- gridBag.setConstraints(httpResponseCode, gbc);
- resultPanel.add(httpResponseCode);
+ responseCodeLabel.setText(JMeterUtils.getResString("HTTP response code") + " : " + responseCode);
// response message label
- JLabel httpResponseMsg = new JLabel();
+
String responseMsgStr = res.getResponseMessage();
log.debug("valueChanged1 : response message - " + responseMsgStr);
- httpResponseMsg.setText("HTTP response message : " + responseMsgStr);
- gbc.gridx = 0;
- gbc.gridy++;
- gridBag.setConstraints(httpResponseMsg, gbc);
- resultPanel.add(httpResponseMsg);
- gbc.gridy++;
+ responseMsgLabel.setText("HTTP response message : " + responseMsgStr);
// get the text response and image icon
// to determine which is NOT null
byte[] responseBytes = (byte[]) res.getResponseData();
ImageIcon icon = null;
- if (res.getDataType() != null
- && res.getDataType().equals(SampleResult.TEXT))
+ if (res.getDataType() != null && res.getDataType().equals(SampleResult.TEXT))
{
try
{
@@ -347,12 +327,6 @@
}
if (response != null)
{
- gbc.gridx = 0;
- gbc.gridy++;
- gridBag.setConstraints(htmlOrTextButton,
- gbc);
- resultPanel.add(htmlOrTextButton);
-
// Text display <=> HTML labeled button
if (HTML_BUTTON_LABEL.equals(htmlOrTextButton.getText()))
{
@@ -369,12 +343,10 @@
JLabel image = new JLabel();
image.setIcon(icon);
- gbc.gridx = 0;
- gridBag.setConstraints(image, gbc);
- resultPanel.add(image);
+ showImage(image);
}
- resultPanel.repaint();
- resultPanel.revalidate();
+ treeSplitPane.revalidate();
+ treeSplitPane.repaint();
}
}
log.debug("End : valueChanged1");
@@ -387,21 +359,18 @@
textArea.setWrapStyleWord(true);
textArea.setTabSize(4);
textArea.setRows(4);
- gridBag.setConstraints(textArea, gbc);
- resultPanel.add(textArea);
- gbc.gridy++;
+ }
+
+ protected void showImage(JLabel image)
+ {
+ textScrollArea.setViewportView(image);
}
protected void showTextResponse(String response)
{
- resultPanel.remove(htmlEditPane);
-
- gbc.gridx = 0;
- gbc.gridy++;
- gridBag.setConstraints(textArea, gbc);
textArea.setText(response);
textArea.setCaretPosition(0);
- resultPanel.add(textArea);
+ textScrollArea.setViewportView(textArea);
}
/**********************************************************************
@@ -452,7 +421,6 @@
// If there is text, render it
if (htmlIndex > -1)
{
- resultPanel.remove(textArea);
String html = response.substring(htmlIndex, response.length());
htmlEditPane.setText(html);
@@ -463,10 +431,7 @@
htmlEditPane.setText(response);
}
htmlEditPane.setCaretPosition(0);
- gbc.gridx = 0;
- gbc.gridy++;
- gridBag.setConstraints(htmlEditPane, gbc);
- resultPanel.add(htmlEditPane);
+ textScrollArea.setViewportView(htmlEditPane);
}
@@ -476,6 +441,26 @@
htmlOrTextButton.addActionListener(this);
}
+ protected Component getBottomPane()
+ {
+ JPanel outerPanel = new JPanel(new BorderLayout());
+ JPanel panel = new JPanel(new VerticalLayout(5, VerticalLayout.LEFT));
+ postDataField = new JLabeledTextArea(JMeterUtils.getResString("request_data"), null);
+ loadTimeLabel = new JLabel();
+ panel.add(postDataField);
+ panel.add(loadTimeLabel);
+ responseCodeLabel = new JLabel();
+ panel.add(responseCodeLabel);
+ responseMsgLabel = new JLabel();
+ panel.add(responseMsgLabel);
+ initHtmlOrTextButton();
+ panel.add(htmlOrTextButton);
+ textScrollArea = new JScrollPane();
+ outerPanel.add(panel,BorderLayout.NORTH);
+ outerPanel.add(textScrollArea,BorderLayout.CENTER);
+ return outerPanel;
+ }
+
/****************************************
* Initialize this visualizer
***************************************/
@@ -483,17 +468,16 @@
{
setLayout(new BorderLayout());
setBorder(makeBorder());
-
+
SampleResult rootSampleResult = new SampleResult();
rootSampleResult.setSampleLabel("Root");
rootSampleResult.setSuccessful(true);
root = new DefaultMutableTreeNode(rootSampleResult);
-
+
treeModel = new DefaultTreeModel(root);
jTree = new JTree(treeModel);
jTree.setCellRenderer(new ResultsNodeRenderer());
- jTree.getSelectionModel().setSelectionMode(
- TreeSelectionModel.SINGLE_TREE_SELECTION);
+ jTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
jTree.addTreeSelectionListener(this);
jTree.setShowsRootHandles(true);
@@ -502,45 +486,24 @@
gridBag = new GridBagLayout();
gbc = new GridBagConstraints();
- resultPanel = new JPanel(gridBag);
- JScrollPane resultPane = new JScrollPane(resultPanel);
-resultPane.setMinimumSize(new Dimension(100, 70));
-resultPane.setPreferredSize(resultPane.getMinimumSize());
-
- initHtmlOrTextButton();
initTextArea();
initHtmlEditPane();
- treeSplitPane =
- new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePane, resultPane);
+ treeSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePane, getBottomPane());
Box titlePanel = makeTitlePanel();
JCheckBox errorCheckBox = getErrorLoggingCheckbox();
errorCheckBox.setAlignmentX(JCheckBox.CENTER_ALIGNMENT);
- titlePanel.add (errorCheckBox);
-
+ titlePanel.add(errorCheckBox);
+
add(titlePanel, BorderLayout.NORTH);
add(treeSplitPane, BorderLayout.CENTER);
}
private class ResultsNodeRenderer extends DefaultTreeCellRenderer
{
- public Component getTreeCellRendererComponent(
- JTree tree,
- Object value,
- boolean sel,
- boolean expanded,
- boolean leaf,
- int row,
- boolean hasFocus)
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus)
{
- super.getTreeCellRendererComponent(
- tree,
- value,
- sel,
- expanded,
- leaf,
- row,
- hasFocus);
+ super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
if (!((SampleResult) ((DefaultMutableTreeNode) value).getUserObject()).isSuccessful())
{
this.setForeground(Color.red);
1.4 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
Index: LoginConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoginConfigGui.java 7 Apr 2003 14:35:20 -0000 1.3
+++ LoginConfigGui.java 23 Apr 2003 14:23:05 -0000 1.4
@@ -133,7 +133,7 @@
if(displayName)
{
- this.add(getNamePanel());
+ this.add(makeTitlePanel());
}
this.add(createUsernamePanel());
1.5 +3 -5 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java
Index: LogicControllerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LogicControllerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogicControllerGui.java 19 Apr 2003 19:40:46 -0000 1.4
+++ LogicControllerGui.java 23 Apr 2003 14:23:05 -0000 1.5
@@ -111,8 +111,6 @@
{
setLayout(new VerticalLayout(5, VerticalLayout.LEFT, VerticalLayout.TOP));
setBorder(BorderFactory.createEmptyBorder(10, 10, 5, 10));
-
- add(createTitleLabel());
- add(getNamePanel());
+ add(makeTitlePanel());
}
}
1.5 +2 -4 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
Index: LoopControlPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoopControlPanel.java 19 Apr 2003 19:40:46 -0000 1.4
+++ LoopControlPanel.java 23 Apr 2003 14:23:06 -0000 1.5
@@ -191,9 +191,7 @@
{
setLayout(new VerticalLayout(5, VerticalLayout.LEFT, VerticalLayout.TOP));
setBorder(BorderFactory.createEmptyBorder(10, 10, 5, 10));
-
- add(createTitleLabel());
- add(getNamePanel());
+ add(makeTitlePanel());
add(createLoopCountPanel());
}
1.8 +2 -3 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestPlanGui.java 19 Apr 2003 19:40:46 -0000 1.7
+++ TestPlanGui.java 23 Apr 2003 14:23:06 -0000 1.8
@@ -142,8 +142,7 @@
this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
Box northPanel = Box.createVerticalBox();
- northPanel.add(createTitleLabel());
- northPanel.add(getNamePanel());
+ northPanel.add(makeTitlePanel());
add(northPanel, BorderLayout.NORTH);
JPanel southPanel = new JPanel(new BorderLayout());
1.9 +2 -4 jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
Index: WorkBenchGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WorkBenchGui.java 19 Apr 2003 19:40:46 -0000 1.8
+++ WorkBenchGui.java 23 Apr 2003 14:23:06 -0000 1.9
@@ -169,9 +169,7 @@
Border margin = new EmptyBorder(10, 10, 5, 10);
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
-
- mainPanel.add(createTitleLabel());
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
this.add(mainPanel);
}
1.12 +7 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Index: AbstractJMeterGuiComponent.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractJMeterGuiComponent.java 20 Apr 2003 18:13:11 -0000 1.11
+++ AbstractJMeterGuiComponent.java 23 Apr 2003 14:23:07 -0000 1.12
@@ -53,6 +53,8 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.gui;
+import java.awt.Component;
+import java.awt.FlowLayout;
import java.awt.Font;
import javax.swing.BorderFactory;
@@ -162,12 +164,14 @@
*
* @return a JLabel which subclasses can add to their GUI
*/
- protected JLabel createTitleLabel() {
+ protected Component createTitleLabel() {
JLabel titleLabel = new JLabel(getStaticLabel());
Font curFont = titleLabel.getFont();
titleLabel.setFont(curFont.deriveFont((float)curFont.getSize() + 4));
- titleLabel.setAlignmentX(0.5f);
- return titleLabel;
+ //titleLabel.setAlignmentX(0.5f);
+ JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+ panel.add(titleLabel);
+ return panel;
}
/**
1.12 +9 -13 jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MainFrame.java 16 Apr 2003 21:15:55 -0000 1.11
+++ MainFrame.java 23 Apr 2003 14:23:07 -0000 1.12
@@ -58,7 +58,6 @@
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
-import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -112,7 +111,8 @@
{
transient private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor("jmeter.gui");
- JPanel all, mainPanel;
+ JPanel all;
+ JScrollPane mainPanel;
Box toolPanel;
JScrollPane treePanel;
JMeterMenuBar menuBar;
@@ -272,10 +272,8 @@
***************************************/
public void setMainPanel(JComponent comp)
{
- mainPanel.removeAll();
- comp.validate();
- mainPanel.add(comp);
- mainPanel.revalidate();
+ mainPanel.setViewportView(comp);
+ mainPanel.validate();
mainPanel.repaint();
}
@@ -364,7 +362,7 @@
}
JSplitPane treeAndMain = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
treeAndMain.setLeftComponent(treePanel);
- treeAndMain.setRightComponent(new JScrollPane(mainPanel));
+ treeAndMain.setRightComponent(mainPanel);
// The setResizeWeight() method was added to JDK1.3. For now, JMeter should
// remain compatible with JDK1.2.
@@ -406,9 +404,7 @@
private void createMainPanel()
{
- mainPanel = new JPanel();
- mainPanel.setLayout(new GridLayout(1, 1));
- mainPanel.add(Box.createGlue());
+ mainPanel = new JScrollPane(Box.createGlue());
}
private JTree makeTree()
1.8 +2 -13 jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ThreadGroupGui.java 7 Apr 2003 14:35:24 -0000 1.7
+++ ThreadGroupGui.java 23 Apr 2003 14:23:07 -0000 1.8
@@ -53,7 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.threads.gui;
-import java.awt.Font;
import java.util.Collection;
import javax.swing.BorderFactory;
@@ -206,17 +205,7 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("thread_group_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
- // NAME
- namePanel = getNamePanel();
- mainPanel.add(namePanel);
+ mainPanel.add(makeTitlePanel());
// THREAD PROPERTIES
JPanel threadPropsPanel = new JPanel();
1.6 +2 -12 jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
Index: FtpConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FtpConfigGui.java 7 Apr 2003 14:35:24 -0000 1.5
+++ FtpConfigGui.java 23 Apr 2003 14:23:07 -0000 1.6
@@ -53,8 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.ftp.config.gui;
-import java.awt.Font;
-
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
@@ -168,16 +166,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("ftp_sample_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// LOOP
mainPanel.add(createServerPanel());
1.6 +2 -13 jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
Index: FtpTestSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FtpTestSamplerGui.java 1 Apr 2003 15:15:54 -0000 1.5
+++ FtpTestSamplerGui.java 23 Apr 2003 14:23:07 -0000 1.6
@@ -53,10 +53,7 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.ftp.control.gui;
-import java.awt.Font;
-
import javax.swing.BorderFactory;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -133,16 +130,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("ftp_testing_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
loginPanel = new LoginConfigGui(false);
ftpDefaultPanel = new FtpConfigGui(false);
1.8 +2 -10 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
Index: HttpDefaultsGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpDefaultsGui.java 7 Apr 2003 14:35:25 -0000 1.7
+++ HttpDefaultsGui.java 23 Apr 2003 14:23:07 -0000 1.8
@@ -57,9 +57,7 @@
import java.awt.BorderLayout;
-import java.awt.Font;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -151,14 +149,8 @@
path = new JLabeledTextField(JMeterUtils.getResString("path"));
port = new JLabeledTextField(JMeterUtils.getResString("web_server_port"));
JPanel topPanel = new JPanel(new VerticalLayout(5,VerticalLayout.LEFT));
- JLabel title = new JLabel(JMeterUtils.getResString("url_config_title"));
- Font curFont = title.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- title.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
-
- topPanel.add(title);
- topPanel.add(getNamePanel());
+
+ topPanel.add(makeTitlePanel());
topPanel.add(protocol);
topPanel.add(domain);
topPanel.add(path);
1.5 +1 -11 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
Index: SoapSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SoapSamplerGui.java 28 Feb 2003 14:21:49 -0000 1.4
+++ SoapSamplerGui.java 23 Apr 2003 14:23:07 -0000 1.5
@@ -1,10 +1,8 @@
package org.apache.jmeter.protocol.http.control.gui;
-import java.awt.Font;
import java.net.MalformedURLException;
import java.net.URL;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -86,16 +84,8 @@
Border margin = new EmptyBorder(10, 10, 5, 10);
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
-
- // TITLE
- JLabel panelTitleLabel = new JLabel(label);
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
mainPanel.add(urlField);
1.8 +10 -25 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Index: AuthPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AuthPanel.java 7 Apr 2003 14:35:26 -0000 1.7
+++ AuthPanel.java 23 Apr 2003 14:23:07 -0000 1.8
@@ -55,7 +55,6 @@
package org.apache.jmeter.protocol.http.gui;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -65,7 +64,6 @@
import javax.swing.Box;
import javax.swing.DefaultCellEditor;
import javax.swing.JButton;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import javax.swing.JScrollPane;
@@ -86,9 +84,9 @@
import org.apache.jmeter.protocol.http.control.Authorization;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.layout.VerticalLayout;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
-import org.apache.jorphan.gui.layout.VerticalLayout;
/****************************************
* Handles input for determining if authentication services are required for a
@@ -177,26 +175,13 @@
// set the layout of the control panel
this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- authManagerPanel = new JPanel();
-
Border margin = new EmptyBorder(10, 10, 5, 10);
- authManagerPanel.setBorder(margin);
+ this.setBorder(margin);
- authManagerPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
-
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("auth_manager_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- authManagerPanel.add(panelTitleLabel);
-
- authManagerPanel.add(getNamePanel());
+ this.add(makeTitlePanel());
JPanel authTablePanel = createAuthTablePanel();
- authManagerPanel.add(authTablePanel);
-
- this.add(authManagerPanel);
+ this.add(authTablePanel);
}
/****************************************
1.9 +5 -20 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Index: CookiePanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CookiePanel.java 7 Apr 2003 14:35:26 -0000 1.8
+++ CookiePanel.java 23 Apr 2003 14:23:07 -0000 1.9
@@ -54,7 +54,6 @@
*/
package org.apache.jmeter.protocol.http.gui;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -63,7 +62,6 @@
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.JButton;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
@@ -340,26 +338,13 @@
// set the layout of the control panel
this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- cookieManagerPanel = new JPanel();
-
Border margin = new EmptyBorder(10, 10, 5, 10);
- cookieManagerPanel.setBorder(margin);
-
- cookieManagerPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+ this.setBorder(margin);
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("cookie_manager_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- cookieManagerPanel.add(panelTitleLabel);
-
- cookieManagerPanel.add(getNamePanel());
+ this.add(makeTitlePanel());
JPanel cookieTablePanel = createCookieTablePanel();
- cookieManagerPanel.add(cookieTablePanel);
-
- this.add(cookieManagerPanel);
+ this.add(cookieTablePanel);
}
/****************************************
1.9 +10 -17 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Index: HeaderPanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HeaderPanel.java 16 Apr 2003 20:18:19 -0000 1.8
+++ HeaderPanel.java 23 Apr 2003 14:23:07 -0000 1.9
@@ -194,14 +194,7 @@
headerManagerPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("header_manager_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- headerManagerPanel.add(panelTitleLabel);
-
- headerManagerPanel.add(getNamePanel());
+ headerManagerPanel.add(makeTitlePanel());
JPanel headerTablePanel = createHeaderTablePanel();
headerManagerPanel.add(headerTablePanel);
1.5 +2 -10 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
Index: AnchorModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AnchorModifierGui.java 28 Feb 2003 14:21:50 -0000 1.4
+++ AnchorModifierGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -117,15 +117,7 @@
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
// TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("anchor_modifier_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
- // NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
this.add(mainPanel);
}
1.6 +2 -12 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
Index: ParamModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ParamModifierGui.java 28 Feb 2003 14:21:50 -0000 1.5
+++ ParamModifierGui.java 23 Apr 2003 14:23:08 -0000 1.6
@@ -1,6 +1,5 @@
package org.apache.jmeter.protocol.http.modifier.gui;
import java.awt.Component;
-import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -156,17 +155,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- //JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("url_config_title"));
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("HTML Parameter Mask"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// PARAMETER MASK
mainPanel.add(getParameterMaskPanel());
1.5 +1 -11 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
Index: URLRewritingModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URLRewritingModifierGui.java 28 Feb 2003 14:21:50 -0000 1.4
+++ URLRewritingModifierGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -1,9 +1,6 @@
package org.apache.jmeter.protocol.http.modifier.gui;
-import java.awt.Font;
-
import javax.swing.JCheckBox;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -49,16 +46,9 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(title);
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
argumentName = new JLabeledTextField(JMeterUtils.getResString("session_argument_name"));
mainPanel.add(argumentName);
pathExt = new JCheckBox(JMeterUtils.getResString("Path_Extension_choice"));
1.5 +2 -14 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
Index: UserParameterModifierGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserParameterModifierGui.java 28 Feb 2003 14:21:51 -0000 1.4
+++ UserParameterModifierGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -53,8 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.http.modifier.gui;
-import java.awt.Font;
-
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
@@ -129,18 +127,8 @@
Border margin = new EmptyBorder(10, 10, 5, 10);
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- //JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("user_parameter_modifier_title"));
- JLabel panelTitleLabel =
- new JLabel(JMeterUtils.getResString("HTTP User Parameter Modifier"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(
- new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// FILE LOCATOR
mainPanel.add(getFileLocator());
mainPanel.add(new JLabel(JMeterUtils.getResString("user_param_mod_help_note")));
1.17 +3 -4 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ProxyControlGui.java 21 Apr 2003 14:51:06 -0000 1.16
+++ ProxyControlGui.java 23 Apr 2003 14:23:08 -0000 1.17
@@ -375,8 +375,7 @@
setBorder (BorderFactory.createEmptyBorder(10, 10, 5, 10));
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
- add(createTitleLabel());
- add(getNamePanel());
+ add(makeTitlePanel());
add(createPortPanel());
add(createIncludePanel());
add(createExcludePanel());
1.5 +2 -12 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
Index: JavaTestSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaTestSamplerGui.java 28 Feb 2003 14:21:51 -0000 1.4
+++ JavaTestSamplerGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -54,9 +54,6 @@
*/
package org.apache.jmeter.protocol.java.control.gui;
-import java.awt.Font;
-
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -125,16 +122,9 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("protocol_java_test_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
javaPanel = new JavaConfigGui(false);
1.6 +2 -12 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java
Index: DbConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DbConfigGui.java 7 Apr 2003 14:35:28 -0000 1.5
+++ DbConfigGui.java 23 Apr 2003 14:23:08 -0000 1.6
@@ -53,8 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.jdbc.config.gui;
-import java.awt.Font;
-
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -154,16 +152,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("database_login_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// URL and JDBC PROPS
JPanel urlJDBCPanel = new JPanel();
1.5 +2 -11 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java
Index: PoolConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolConfigGui.java 28 Feb 2003 14:21:51 -0000 1.4
+++ PoolConfigGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -53,7 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.jdbc.config.gui;
-import java.awt.Font;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
@@ -202,16 +201,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("database_conn_pool_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// CONNECTION POOL
JPanel connPoolPanel = new JPanel();
1.5 +2 -11 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java
Index: SqlConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SqlConfigGui.java 28 Feb 2003 14:21:51 -0000 1.4
+++ SqlConfigGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -53,8 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.jdbc.config.gui;
-import java.awt.Font;
-
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
@@ -140,16 +138,9 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("database_sql_query_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// SQL
mainPanel.add(createSqlPanel());
1.5 +2 -13 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control/gui/JdbcTestSampleGui.java
Index: JdbcTestSampleGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control/gui/JdbcTestSampleGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JdbcTestSampleGui.java 28 Feb 2003 14:21:52 -0000 1.4
+++ JdbcTestSampleGui.java 23 Apr 2003 14:23:08 -0000 1.5
@@ -53,9 +53,6 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.jdbc.control.gui;
-import java.awt.Font;
-
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -136,16 +133,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // TITLE
- JLabel panelTitleLabel = new JLabel(JMeterUtils.getResString("database_testing_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
// NAME
- mainPanel.add(getNamePanel());
+ mainPanel.add(makeTitlePanel());
// DATABASE
dbGui = new DbConfigGui(false);
1.2 +1 -12 jakarta-jmeter/src/protocol/jndi/config/gui/JndiConfigGui.java
Index: JndiConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jndi/config/gui/JndiConfigGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JndiConfigGui.java 11 Aug 2002 19:24:53 -0000 1.1
+++ JndiConfigGui.java 23 Apr 2003 14:23:09 -0000 1.2
@@ -129,18 +129,7 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // title
- JLabel panelTitleLabel = new JLabel(
- JMeterUtils.getResString("jndi_config_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(), curFontSize));
- mainPanel.add(panelTitleLabel);
-
- // name
- namePanel = new NamePanel(model);
- mainPanel.add(namePanel);
+ mainPanel.add(makeTitlePanel());
// jndi properties
JPanel urlJNDIPanel = new JPanel();
1.2 +3 -14 jakarta-jmeter/src/protocol/jndi/control/gui/JndiTestSampleGui.java
Index: JndiTestSampleGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jndi/control/gui/JndiTestSampleGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JndiTestSampleGui.java 11 Aug 2002 19:24:54 -0000 1.1
+++ JndiTestSampleGui.java 23 Apr 2003 14:23:09 -0000 1.2
@@ -54,7 +54,7 @@
*/
package org.apache.jmeter.ejb.jndi.control.gui;
-import java.awt.Font;
+
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.JLabel;
@@ -109,19 +109,8 @@
mainPanel.setBorder(margin);
mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
- // title
- JLabel panelTitleLabel = new JLabel(
- JMeterUtils.getResString("jndi_testing_title"));
- Font curFont = panelTitleLabel.getFont();
- int curFontSize = curFont.getSize();
- curFontSize += 4;
- panelTitleLabel.setFont(new Font(curFont.getFontName(), curFont.getStyle(),
- curFontSize));
- mainPanel.add(panelTitleLabel);
-
- // name
- namePanel = new NamePanel(model);
- mainPanel.add(namePanel);
+
+ mainPanel.add(makeTitlePanel());
// jndi
jndiConfigGui = new JndiConfigGui(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org