Can someone please apply the attached diff?
I made some improvements in the properties handling code,
so that properties passed by the java environment can also
be used. Also, there are some hooks for my Client Certificate
selection code (I had to scale back what I was starting to
do mainly because the JSSE API won't handle it). Lastly,
I provided a facility to automatically choose the Look
And Feel you want at startup time.
Please note, the SSL Manager menu option will only appear
if JSSE is installed! It does a quick runtime test to
see if the necessary class is installed and then adds
the menu item if it does.
Index: src/org/apache/jmeter/gui/JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v
retrieving revision 1.9
diff -u -b -r1.9 JMeterMenuBar.java
--- src/org/apache/jmeter/gui/JMeterMenuBar.java 2001/08/05 13:22:08 1.9
+++ src/org/apache/jmeter/gui/JMeterMenuBar.java 2001/08/30 21:09:03
@@ -90,6 +90,7 @@
JMenuItem analyze;
JMenu optionsMenu;
JMenu lafMenu;
+ JMenuItem sslManager;
JMenu helpMenu;
JMenuItem help_about;
@@ -193,11 +194,24 @@
JMenuItem laf = new JMenuItem(lafs[i].getName());
laf.addActionListener(ActionRouter.getInstance());
laf.setActionCommand("laf:" + lafs[i].getClassName());
+ lafMenu.setMnemonic('L');
lafMenu.add(laf);
}
optionsMenu.setMnemonic('O');
optionsMenu.add(lafMenu);
+ try {
+ Class.forName("com.sun.net.ssl.KeyManager");
+ sslManager = new JMenuItem(rb.getString("sslmanager"));
+ sslManager.addActionListener(ActionRouter.getInstance());
+ sslManager.setActionCommand("sslmanager");
+ sslManager.setMnemonic('S');
+ sslManager.setAccelerator(KeyStroke.getKeyStroke("control M"));
+ optionsMenu.add(sslManager);
+ } catch (Exception e) {
+ // ignore and do not set up SSL menu
+ }
+
helpMenu = new JMenu(rb.getString("help"));
helpMenu.setMnemonic('H');
help_about = new JMenuItem(rb.getString("about"), 'A');
Index: src/org/apache/jmeter/gui/action/LookAndFeelCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/LookAndFeelCommand.java,v
retrieving revision 1.4
diff -u -b -r1.4 LookAndFeelCommand.java
--- src/org/apache/jmeter/gui/action/LookAndFeelCommand.java 2001/07/26 00:34:45
1.4
+++ src/org/apache/jmeter/gui/action/LookAndFeelCommand.java 2001/08/30 21:09:04
@@ -81,6 +81,13 @@
UIManager.LookAndFeelInfo[] lfs = UIManager.getInstalledLookAndFeels();
for(int i=0;i<lfs.length;i++)
commands.add("laf:"+lfs[i].getClassName());
+
+ try {
+ String defaultUI=
+JMeterUtils.getJMeterProperties().getProperty("jmeter.laf",
+UIManager.getCrossPlatformLookAndFeelClassName());
+ UIManager.setLookAndFeel(defaultUI);
+ } catch (Exception e) {
+ // ignore defaultUI setting
+ }
}
public LookAndFeelCommand()
Index: src/org/apache/jmeter/resources/messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.6
diff -u -b -r1.6 messages.properties
--- src/org/apache/jmeter/resources/messages.properties 2001/08/30 17:19:02 1.6
+++ src/org/apache/jmeter/resources/messages.properties 2001/08/30 21:09:06
@@ -14,6 +14,7 @@
analyze=Analyze Data File...
option=Option
appearance=Look and Feel
+sslmanager=SSL Manager...
help=Help
about=About
remote_start=Remote Start
Index: src/org/apache/jmeter/util/JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.10
diff -u -b -r1.10 JMeterUtils.java
--- src/org/apache/jmeter/util/JMeterUtils.java 2001/08/17 21:21:36 1.10
+++ src/org/apache/jmeter/util/JMeterUtils.java 2001/08/30 21:09:08
@@ -102,7 +102,7 @@
*/
public static Properties getProperties(String file)
{
- Properties p = new Properties();
+ Properties p = new Properties(System.getProperties());
try
{
File f = new File(file);
@@ -110,7 +110,6 @@
}
catch (Exception e)
{
- p.clear();
try
{
p.load(JMeterUtils.class.getClassLoader().getSystemResourceAsStream("org/apache/jmeter/jmeter.properties"));
Index: bin/jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.22
diff -u -b -r1.22 jmeter.properties
--- bin/jmeter.properties 2001/08/30 17:19:01 1.22
+++ bin/jmeter.properties 2001/08/30 21:09:08
@@ -23,6 +23,13 @@
#ssl.provider=com.sun.net.ssl.internal.ssl.Provider
#ssl.pkgs=com.sun.net.ssl.internal.www.protocol
+#Classname of the Swing default UI
+#Installed Look and Feel classes on Windows are:
+# Metal = javax.swing.plaf.metal.MetalLookAndFeel
+# Motif = com.sun.java.swing.plaf.motif.MotifLookAndFeel
+# Windows = com.sun.java.swing.plaf.windows.WindowsLookAndFeel
+jmeter.laf=javax.swing.plaf.metal.MetalLookAndFeel
+
#icons
timer.tree.icon=timer.gif
listener.tree.icon=ear.gif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
