khammond 01/10/02 07:16:22
Modified: src/org/apache/jmeter/protocol/jdbc/config/gui
DbConfigGui.java PoolConfigGui.java
SqlConfigGui.java
Log:
New GUI style.
Revision Changes Path
1.5 +86 -21
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java
Index: DbConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DbConfigGui.java 2001/07/26 00:34:49 1.4
+++ DbConfigGui.java 2001/10/02 14:16:22 1.5
@@ -52,12 +52,15 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
- package org.apache.jmeter.protocol.jdbc.config.gui;
+package org.apache.jmeter.protocol.jdbc.config.gui;
+import java.awt.*;
import java.awt.event.*;
-
import javax.swing.*;
+import javax.swing.border.*;
+
import org.apache.jmeter.gui.*;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.config.gui.LoginConfigGui;
import org.apache.jmeter.protocol.jdbc.config.DbConfig;
@@ -80,9 +83,9 @@
private boolean displayName;
private NamePanel namePanel;
private LoginConfigGui loginGui;
- private JTextField urlField = new JTextField(30);
- private JTextField subProtocolField = new JTextField(30);
- private JTextField driverField = new JTextField(30);
+ private JTextField urlField = new JTextField(20);
+ private JTextField subProtocolField = new JTextField(20);
+ private JTextField driverField = new JTextField(20);
public DbConfigGui()
{
@@ -109,24 +112,88 @@
private void init()
{
- this.setLayout(new VerticalLayout(1,VerticalLayout.LEFT));
- namePanel = new NamePanel(model);
- if(displayName)
+ if (displayName)
{
- this.add(namePanel);
+ this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
+ // MAIN PANEL
+ JPanel mainPanel = new JPanel();
+ 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("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
+ namePanel = new NamePanel(model);
+ mainPanel.add(namePanel);
+
+ // URL and JDBC PROPS
+ JPanel urlJDBCPanel = new JPanel();
+ urlJDBCPanel.setLayout(new
VerticalLayout(5,VerticalLayout.LEFT));
+
urlJDBCPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("database_url_jdbc_props")));
+
+ // URL
+ urlJDBCPanel.add(getUrlPanel());
+
+ // SUBPROTOCOL
+ urlJDBCPanel.add(getSubProtocolPanel());
+
+ // DRIVER
+ urlJDBCPanel.add(getDriverPanel());
+
+ mainPanel.add(urlJDBCPanel);
+
+ // LOGIN
+ loginGui = new LoginConfigGui(false);
+ loginGui.setModel(model);
+ JPanel loginPanel = new JPanel();
+
loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+ loginPanel.add(loginGui);
+ mainPanel.add(loginPanel);
+
+ this.add(mainPanel);
}
- loginGui = new LoginConfigGui(false);
- loginGui.setModel(model);
- this.add(loginGui);
- this.add(getUrlPanel());
- this.add(getSubProtocolPanel());
- this.add(getDriverPanel());
+ else
+ {
+ this.setLayout(new VerticalLayout(5,VerticalLayout.LEFT));
+
+ // URL and JDBC PROPS
+ JPanel urlJDBCPanel = new JPanel();
+ urlJDBCPanel.setLayout(new
VerticalLayout(5,VerticalLayout.LEFT));
+
urlJDBCPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("database_url_jdbc_props")));
+
+ // URL
+ urlJDBCPanel.add(getUrlPanel());
+
+ // SUBPROTOCOL
+ urlJDBCPanel.add(getSubProtocolPanel());
+
+ // DRIVER
+ urlJDBCPanel.add(getDriverPanel());
+
+ this.add(urlJDBCPanel);
+
+ // LOGIN
+ loginGui = new LoginConfigGui(false);
+ loginGui.setModel(model);
+ JPanel loginPanel = new JPanel();
+
loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+ loginPanel.add(loginGui);
+ this.add(loginPanel);
+ }
}
private JPanel getDriverPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel("Driver Class"));
+ panel.add(new
JLabel(JMeterUtils.getResString("database_driver_class")));
driverField.setText(model.getDriver());
driverField.setName(DRIVER);
driverField.addKeyListener(this);
@@ -137,7 +204,7 @@
private JPanel getSubProtocolPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel("Sub Protocol"));
+ panel.add(new
JLabel(JMeterUtils.getResString("database_sub_protocol")));
subProtocolField.setText(model.getSubProtocol());
subProtocolField.setName(PROTOCOL);
subProtocolField.addKeyListener(this);
@@ -148,7 +215,7 @@
private JPanel getUrlPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel("Database URL"));
+ panel.add(new JLabel(JMeterUtils.getResString("database_url")));
urlField.setText(model.getUrl());
urlField.setName(URL);
urlField.addKeyListener(this);
@@ -180,6 +247,4 @@
model.setSubProtocol(subProtocolField.getText());
}
}
-
-
-}
\ No newline at end of file
+}
1.7 +59 -9
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java
Index: PoolConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PoolConfigGui.java 2001/07/26 00:34:49 1.6
+++ PoolConfigGui.java 2001/10/02 14:16:22 1.7
@@ -54,9 +54,13 @@
*/
package org.apache.jmeter.protocol.jdbc.config.gui;
+import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
+import javax.swing.border.*;
+
import org.apache.jmeter.gui.*;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.protocol.jdbc.config.*;
/**
@@ -104,20 +108,66 @@
private void init()
{
- this.setLayout(new VerticalLayout(1,VerticalLayout.LEFT));
- namePanel = new NamePanel(model);
- if(displayName)
+ if (displayName)
{
- this.add(namePanel);
+ this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
+ // MAIN PANEL
+ JPanel mainPanel = new JPanel();
+ 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("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
+ namePanel = new NamePanel(model);
+ mainPanel.add(namePanel);
+
+ // CONNECTION POOL
+ JPanel connPoolPanel = new JPanel();
+ connPoolPanel.setLayout(new
VerticalLayout(5,VerticalLayout.LEFT));
+
connPoolPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("database_conn_pool_props")));
+
+ // NUMBER OF CONNECTIONS
+ connPoolPanel.add(createConnPanel());
+
+ // MAX USAGE
+ connPoolPanel.add(createMaxUsePanel());
+
+ mainPanel.add(connPoolPanel);
+
+ this.add(mainPanel);
+ }
+ else
+ {
+ this.setLayout(new VerticalLayout(5,VerticalLayout.LEFT));
+
+ // CONNECTION POOL
+ JPanel connPoolPanel = new JPanel();
+ connPoolPanel.setLayout(new
VerticalLayout(5,VerticalLayout.LEFT));
+
connPoolPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("database_conn_pool_props")));
+
+ // NUMBER OF CONNECTIONS
+ connPoolPanel.add(createConnPanel());
+
+ // MAX USAGE
+ connPoolPanel.add(createMaxUsePanel());
+
+ this.add(connPoolPanel);
}
- this.add(createConnPanel());
- this.add(createMaxUsePanel());
}
private JPanel createConnPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel("Number of Connections in Pool"));
+ panel.add(new
JLabel(JMeterUtils.getResString("database_conn_pool_size")));
connField.setText(Integer.toString(model.getNumConnections()));
connField.setName(CONNECTIONS);
connField.addKeyListener(this);
@@ -128,7 +178,7 @@
private JPanel createMaxUsePanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel("Max usage for each connection"));
+ panel.add(new
JLabel(JMeterUtils.getResString("database_conn_pool_max_usage")));
maxUseField.setText(Integer.toString(model.getMaxUse()));
maxUseField.setName(MAXUSE);
maxUseField.addKeyListener(this);
@@ -156,4 +206,4 @@
model.setMaxUse(Integer.parseInt(maxUseField.getText()));
}
}
-}
\ No newline at end of file
+}
1.6 +42 -8
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java
Index: SqlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SqlConfigGui.java 2001/07/26 00:34:49 1.5
+++ SqlConfigGui.java 2001/10/02 14:16:22 1.6
@@ -55,8 +55,12 @@
package org.apache.jmeter.protocol.jdbc.config.gui;
import javax.swing.*;
+import javax.swing.border.*;
import java.awt.event.*;
+import java.awt.*;
+
import org.apache.jmeter.gui.*;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.protocol.jdbc.config.SqlConfig;
/**
@@ -94,18 +98,48 @@
public void updateGui()
{
sqlField.setText(model.getQuery());
- namePanel.updateGui();
+
+ if (displayName)
+ {
+ namePanel.updateGui();
+ }
}
private void init()
{
- this.setLayout(new VerticalLayout(1,VerticalLayout.LEFT));
- namePanel = new NamePanel(model);
- if(displayName)
+ if (displayName)
+ {
+ this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
+ // MAIN PANEL
+ JPanel mainPanel = new JPanel();
+ 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("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
+ namePanel = new NamePanel(model);
+ mainPanel.add(namePanel);
+
+ // SQL
+ mainPanel.add(createSqlPanel());
+
+ this.add(mainPanel);
+ }
+ else
{
- this.add(namePanel);
+ this.setLayout(new VerticalLayout(5,VerticalLayout.LEFT));
+ this.add(createSqlPanel());
}
- this.add(createSqlPanel());
+
updateGui();
}
@@ -113,7 +147,7 @@
{
JPanel panel = new JPanel();
sqlField.addKeyListener(this);
- panel.add(new JLabel("SQL Query String"));
+ panel.add(new
JLabel(JMeterUtils.getResString("database_sql_query_string")));
panel.add(sqlField);
return panel;
}
@@ -131,4 +165,4 @@
model.setQuery(sqlField.getText());
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
