Attachment #32303 for bug #57365

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




import java.util.concurrent.atomic.AtomicInteger;

import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.tree.TreePath;

import org.apache.commons.cli.avalon.CLArgsParser;

import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.Load;
import org.apache.jmeter.gui.action.LoadRecentProject;
import org.apache.jmeter.gui.action.LookAndFeelCommand;
import org.apache.jmeter.gui.tree.JMeterTreeListener;
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;

 * Main JMeter class; processes options and starts the GUI, non-GUI or server as appropriate.
 */
public class JMeter implements JMeterPlugin {

    private static final Logger log = LoggingManager.getLoggerForClass();
    
    static {
        String jMeterLaf = LookAndFeelCommand.getJMeterLaf();
        try {
            UIManager.setLookAndFeel(jMeterLaf);
        } catch (Exception ex) {
            log.warn("Could not set LAF to:"+jMeterLaf, ex);
        }
    }

    public static final int UDP_PORT_DEFAULT = 4445; // needed for ShutdownClient


Lines 92-101 Link Here

(-)src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (-4 / +2 lines)
92	* </ul>	92	* </ul>
93	* @return LAF classname	93	* @return LAF classname
94	*/	94	*/
95	private static String getJMeterLaf(){	95	public static String getJMeterLaf(){
96	String laf;	96	String laf = PREFS.get(USER_PREFS_KEY, null);
97
98	laf = PREFS.get(USER_PREFS_KEY, null);
99	if (laf != null) {	97	if (laf != null) {
100	return checkLafName(laf);	98	return checkLafName(laf);
101	}	99	}

Return to bug 57365

Lines 45-50 Link Here

(-)src/core/org/apache/jmeter/JMeter.java (-1 / +11 lines)
45	import java.util.concurrent.atomic.AtomicInteger;	45	import java.util.concurrent.atomic.AtomicInteger;
46		46
47	import javax.swing.JTree;	47	import javax.swing.JTree;
		48	import javax.swing.UIManager;
48	import javax.swing.tree.TreePath;	49	import javax.swing.tree.TreePath;
49		50
50	import org.apache.commons.cli.avalon.CLArgsParser;	51	import org.apache.commons.cli.avalon.CLArgsParser;
Lines 63-68 Link Here
63	import org.apache.jmeter.gui.action.ActionRouter;	64	import org.apache.jmeter.gui.action.ActionRouter;
64	import org.apache.jmeter.gui.action.Load;	65	import org.apache.jmeter.gui.action.Load;
65	import org.apache.jmeter.gui.action.LoadRecentProject;	66	import org.apache.jmeter.gui.action.LoadRecentProject;
		67	import org.apache.jmeter.gui.action.LookAndFeelCommand;
66	import org.apache.jmeter.gui.tree.JMeterTreeListener;	68	import org.apache.jmeter.gui.tree.JMeterTreeListener;
67	import org.apache.jmeter.gui.tree.JMeterTreeModel;	69	import org.apache.jmeter.gui.tree.JMeterTreeModel;
68	import org.apache.jmeter.gui.tree.JMeterTreeNode;	70	import org.apache.jmeter.gui.tree.JMeterTreeNode;
Lines 97-104 Link Here
97	* Main JMeter class; processes options and starts the GUI, non-GUI or server as appropriate.	99	* Main JMeter class; processes options and starts the GUI, non-GUI or server as appropriate.
98	*/	100	*/
99	public class JMeter implements JMeterPlugin {	101	public class JMeter implements JMeterPlugin {
100
101	private static final Logger log = LoggingManager.getLoggerForClass();	102	private static final Logger log = LoggingManager.getLoggerForClass();
		103
		104	static {
		105	String jMeterLaf = LookAndFeelCommand.getJMeterLaf();
		106	try {
		107	UIManager.setLookAndFeel(jMeterLaf);
		108	} catch (Exception ex) {
		109	log.warn("Could not set LAF to:"+jMeterLaf, ex);
		110	}
		111	}
102		112
103	public static final int UDP_PORT_DEFAULT = 4445; // needed for ShutdownClient	113	public static final int UDP_PORT_DEFAULT = 4445; // needed for ShutdownClient
104		114