You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/10 21:29:25 UTC
svn commit: r1782531 - in /jmeter/trunk/src/core/org/apache/jmeter/gui: ./
action/template/ action/validation/ tree/ util/
Author: pmouawad
Date: Fri Feb 10 21:29:25 2017
New Revision: 1782531
URL: http://svn.apache.org/viewvc?rev=1782531&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - core/gui package (1/2)
Contributed by Woonsan Ko
This comments #272
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java Fri Feb 10 21:29:25 2017
@@ -35,8 +35,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Printable;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This abstract class takes care of the most basic functions necessary to
@@ -55,10 +55,10 @@ import org.apache.log.Logger;
*
*/
public abstract class AbstractJMeterGuiComponent extends JPanel implements JMeterGUIComponent, Printable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
/** Logging */
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AbstractJMeterGuiComponent.class);
/** Flag indicating whether or not this component is enabled. */
private boolean enabled = true;
@@ -114,9 +114,9 @@ public abstract class AbstractJMeterGuiC
* developers will need to override.
*/
@Override
- public void setEnabled(boolean e) {
- log.debug("Setting enabled: " + e);
- enabled = e;
+ public void setEnabled(boolean enabled) {
+ log.debug("Setting enabled: {}", enabled);
+ this.enabled = enabled;
}
/**
@@ -234,7 +234,7 @@ public abstract class AbstractJMeterGuiC
mc.setProperty(new StringProperty(TestElement.TEST_CLASS, mc.getClass().getName()));
// This stores the state of the TestElement
- log.debug("setting element to enabled: " + enabled);
+ log.debug("setting element to enabled: {}", enabled);
mc.setEnabled(enabled);
mc.setComment(getComment());
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Fri Feb 10 21:29:25 2017
@@ -98,9 +98,9 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The main JMeter frame, containing the menu bar, test tree, and an area for
@@ -109,7 +109,7 @@ import org.apache.log.Logger;
*/
public class MainFrame extends JFrame implements TestStateListener, Remoteable, DropTargetListener, Clearable, ActionListener {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
// This is used to keep track of local (non-remote) tests
// The name is chosen to be an unlikely host-name
@@ -126,7 +126,7 @@ public class MainFrame extends JFrame im
private static final boolean DISPLAY_LOGGER_PANEL =
JMeterUtils.getPropDefault("jmeter.loggerpanel.display", false); // $NON-NLS-1$
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(MainFrame.class);
/** The menu bar. */
private JMeterMenuBar menuBar;
@@ -692,10 +692,10 @@ public class MainFrame extends JFrame im
public void actionPerformed(ActionEvent actionEvent) {
String propname = "gui.quick_" + actionEvent.getActionCommand();
String comp = JMeterUtils.getProperty(propname);
- log.debug("Event " + propname + ": " + comp);
+ log.debug("Event {}: {}", propname, comp);
if (comp == null) {
- log.warn("No component set through property: " + propname);
+ log.warn("No component set through property: {}", propname);
return;
}
@@ -714,7 +714,7 @@ public class MainFrame extends JFrame im
guiPackage.getMainFrame().getTree().setSelectionPath(new TreePath(node.getPath()));
}
} catch (Exception err) {
- log.warn("Failed to perform quick component add: " + comp, err); // $NON-NLS-1$
+ log.warn("Failed to perform quick component add: {}", comp, err); // $NON-NLS-1$
}
}
};
@@ -794,7 +794,7 @@ public class MainFrame extends JFrame im
}
}
} catch (UnsupportedFlavorException | IOException e) {
- log.warn("Dnd failed" , e);
+ log.warn("Dnd failed", e);
}
}
@@ -808,7 +808,9 @@ public class MainFrame extends JFrame im
}
File file = files.get(0);
if (!file.getName().endsWith(".jmx")) {
- log.warn("Importing file:" + file.getName()+ "from DnD failed because file extension does not end with .jmx");
+ if (log.isWarnEnabled()) {
+ log.warn("Importing file, {}, from DnD failed because file extension does not end with .jmx", file.getName());
+ }
return false;
}
@@ -885,7 +887,9 @@ public class MainFrame extends JFrame im
awtAppClassName.setAccessible(true);
awtAppClassName.set(null, DEFAULT_APP_NAME);
} catch (NoSuchFieldException | IllegalAccessException nsfe) {
- log.warn("Error awt title: " + nsfe); // $NON-NLS-1$
+ if (log.isWarnEnabled()) {
+ log.warn("Error awt title: {}", nsfe.toString()); // $NON-NLS-1$
+ }
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Fri Feb 10 21:29:25 2017
@@ -44,9 +44,9 @@ import javax.swing.JRootPane;
import org.apache.jmeter.gui.action.KeyStrokes;
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.Functor;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generates Configure pop-up dialogue for Listeners from all methods in SampleSaveConfiguration
@@ -57,9 +57,9 @@ import org.apache.log.Logger;
*/
public class SavePropertyDialog extends JDialog implements ActionListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SavePropertyDialog.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
private static final Map<String, Functor> functors = new HashMap<>();
@@ -85,14 +85,14 @@ public class SavePropertyDialog extends
{
super(owner, title, modal);
saveConfig = s;
- log.debug("SampleSaveConfiguration = " + saveConfig);// $NON-NLS-1$
+ log.debug("SampleSaveConfiguration = {}", saveConfig);// $NON-NLS-1$
initDialog();
}
private void initDialog() {
this.getContentPane().setLayout(new BorderLayout());
final int configCount = (SampleSaveConfiguration.SAVE_CONFIG_NAMES.size() / 3) + 1;
- log.debug("grid panel is " + 3 + " by " + configCount);
+ log.debug("grid panel is {} by {}", 3, configCount);
JPanel checkPanel = new JPanel(new GridLayout(configCount, 3));
for (final String name : SampleSaveConfiguration.SAVE_CONFIG_NAMES) {
try {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Fri Feb 10 21:29:25 2017
@@ -31,8 +31,8 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class serves storing Test Tree state and navigating through it
@@ -44,7 +44,7 @@ public class UndoHistory implements Tree
/**
*
*/
- private static final long serialVersionUID = -974269825492906010L;
+ private static final long serialVersionUID = 1L;
/**
* Interface to be implemented by components interested in UndoHistory
@@ -78,7 +78,7 @@ public class UndoHistory implements Tree
}
}
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(UndoHistory.class);
/**
* temporary storage for GUI tree expansion state
@@ -152,7 +152,7 @@ public class UndoHistory implements Tree
String name = root.getName();
- log.debug("Adding history element " + name + ": " + comment);
+ log.debug("Adding history element {}: {}", name, comment);
working = true;
// get test plan tree
@@ -162,7 +162,9 @@ public class UndoHistory implements Tree
position++;
while (history.size() > position) {
- log.debug("Removing further record, position: " + position + ", size: " + history.size());
+ if (log.isDebugEnabled()) {
+ log.debug("Removing further record, position: {}, size: {}", position, history.size());
+ }
history.remove(history.size() - 1);
}
@@ -171,7 +173,7 @@ public class UndoHistory implements Tree
history.add(new UndoHistoryItem(copy, comment));
- log.debug("Added history element, position: " + position + ", size: " + history.size());
+ log.debug("Added history element, position: {}, size: {}", position, history.size());
working = false;
notifyListeners();
}
@@ -183,7 +185,7 @@ public class UndoHistory implements Tree
* @param acceptorModel TreeModel to accept the changes
*/
public void moveInHistory(int offset, JMeterTreeModel acceptorModel) {
- log.debug("Moving history from position " + position + " with step " + offset + ", size is " + history.size());
+ log.debug("Moving history from position {} with step {}, size is {}", position, offset, history.size());
if (offset < 0 && !canUndo()) {
log.warn("Can't undo, we're already on the last record");
return;
@@ -212,7 +214,9 @@ public class UndoHistory implements Tree
// load tree UI state
restoreTreeState(guiInstance);
- log.debug("Current position " + position + ", size is " + history.size());
+ if (log.isDebugEnabled()) {
+ log.debug("Current position {}, size is {}", position, history.size());
+ }
// refresh the all ui
guiInstance.updateCurrentGui();
@@ -262,7 +266,7 @@ public class UndoHistory implements Tree
@Override
public void treeNodesChanged(TreeModelEvent tme) {
String name = ((JMeterTreeNode) tme.getTreePath().getLastPathComponent()).getName();
- log.debug("Nodes changed " + name);
+ log.debug("Nodes changed {}", name);
final JMeterTreeModel sender = (JMeterTreeModel) tme.getSource();
add(sender, "Node changed " + name);
}
@@ -275,7 +279,7 @@ public class UndoHistory implements Tree
@Override
public void treeNodesInserted(TreeModelEvent tme) {
String name = ((JMeterTreeNode) tme.getTreePath().getLastPathComponent()).getName();
- log.debug("Nodes inserted " + name);
+ log.debug("Nodes inserted {}", name);
final JMeterTreeModel sender = (JMeterTreeModel) tme.getSource();
add(sender, "Add " + name);
}
@@ -288,7 +292,7 @@ public class UndoHistory implements Tree
@Override
public void treeNodesRemoved(TreeModelEvent tme) {
String name = ((JMeterTreeNode) tme.getTreePath().getLastPathComponent()).getName();
- log.debug("Nodes removed: " + name);
+ log.debug("Nodes removed: {}", name);
add((JMeterTreeModel) tme.getSource(), "Remove " + name);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java Fri Feb 10 21:29:25 2017
@@ -27,8 +27,8 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.StreamException;
@@ -50,7 +50,7 @@ public class TemplateManager {
private static final String TEMPLATE_FILES = JMeterUtils.getPropDefault("template.files", // $NON-NLS-1$
"/bin/templates/templates.xml");
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TemplateManager.class);
private static final TemplateManager SINGLETON = new TemplateManager();
@@ -134,7 +134,9 @@ public class TemplateManager {
final File f = new File(JMeterUtils.getJMeterHome(), templateFile);
try {
if(f.exists() && f.canRead()) {
- log.info("Reading templates from:"+f.getAbsolutePath());
+ if (log.isInfoEnabled()) {
+ log.info("Reading templates from: {}", f.getAbsolutePath());
+ }
final File parent = f.getParentFile();
final LinkedHashMap<String, Template> templates = ((Templates) xstream.fromXML(f)).templates;
for(Template t : templates.values()) {
@@ -144,10 +146,16 @@ public class TemplateManager {
}
temps.putAll(templates);
} else {
- log.warn("Ignoring template file:'"+f.getAbsolutePath()+"' as it does not exist or is not readable");
+ if (log.isWarnEnabled()) {
+ log.warn("Ignoring template file:'{}' as it does not exist or is not readable",
+ f.getAbsolutePath());
+ }
+ }
+ } catch(Exception ex) {
+ if (log.isWarnEnabled()) {
+ log.warn("Ignoring template file:'{}', an error occured parsing the file", f.getAbsolutePath(),
+ ex);
}
- } catch(Exception ex) {
- log.warn("Ignoring template file:'"+f.getAbsolutePath()+"', an error occured parsing the file", ex);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/validation/TreeClonerForValidation.java Fri Feb 10 21:29:25 2017
@@ -25,8 +25,8 @@ import org.apache.jmeter.threads.ThreadG
import org.apache.jmeter.timers.Timer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.backend.Backend;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Clones the test tree, skipping test elements that implement {@link Timer} by default.
@@ -34,7 +34,7 @@ import org.apache.log.Logger;
*/
public class TreeClonerForValidation extends TreeCloner {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TreeClonerForValidation.class);
/**
* Number of Threads to configure when running a Thread Group during a validation
@@ -57,11 +57,8 @@ public class TreeClonerForValidation ext
protected static final int VALIDATION_ITERATIONS = JMeterUtils.getPropDefault("testplan_validation.number_iterations", 1); //$NON-NLS-1$
static {
- if(LOG.isInfoEnabled()) {
- LOG.info("Running validation with number of threads:"+VALIDATION_NUMBER_OF_THREADS
- + ", ignoreTimers:"+VALIDATION_IGNORE_TIMERS
- + ", number of iterations:"+VALIDATION_ITERATIONS);
- }
+ log.info("Running validation with number of threads:{}, ignoreTimers:{}, number of iterations:{}",
+ VALIDATION_NUMBER_OF_THREADS, VALIDATION_IGNORE_TIMERS, VALIDATION_ITERATIONS);
}
public TreeClonerForValidation() {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java Fri Feb 10 21:29:25 2017
@@ -37,11 +37,11 @@ import org.apache.jmeter.gui.MainFrame;
import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.KeyStrokes;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMeterTreeListener implements TreeSelectionListener, MouseListener, KeyListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMeterTreeListener.class);
private TreePath currentPath;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Fri Feb 10 21:29:25 2017
@@ -36,13 +36,13 @@ import org.apache.jmeter.gui.GUIFactory;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMeterTreeNode extends DefaultMutableTreeNode implements NamedTreeNode {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMeterTreeNode.class);
private static final int TEST_PLAN_LEVEL = 1;
@@ -123,21 +123,21 @@ public class JMeterTreeNode extends Defa
Object clazz = Introspector.getBeanInfo(testClass).getBeanDescriptor()
.getValue(TestElement.GUI_CLASS);
if (clazz == null) {
- log.warn("getIcon(): Can't obtain GUI class from " + testClass.getName());
+ log.warn("getIcon(): Can't obtain GUI class from {}", testClass);
return null;
}
return GUIFactory.getIcon(Class.forName((String) clazz), enabled);
}
return new ImageIcon(img);
} catch (IntrospectionException e1) {
- log.error("Can't obtain icon for class "+testElement, e1);
+ log.error("Can't obtain icon for class {}", testElement, e1);
throw new org.apache.jorphan.util.JMeterError(e1);
}
}
return GUIFactory.getIcon(Class.forName(testElement.getPropertyAsString(TestElement.GUI_CLASS)),
enabled);
} catch (ClassNotFoundException e) {
- log.warn("Can't get icon for class " + testElement, e);
+ log.warn("Can't get icon for class {}", testElement, e);
return null;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java Fri Feb 10 21:29:25 2017
@@ -34,14 +34,14 @@ import javax.swing.tree.TreePath;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.util.MenuFactory;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMeterTreeTransferHandler extends TransferHandler {
- private static final long serialVersionUID = 8560957372186260765L;
+ private static final long serialVersionUID = 1L;
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMeterTreeTransferHandler.class);
private DataFlavor nodeFlavor;
private DataFlavor[] jMeterTreeNodeDataFlavors = new DataFlavor[1];
@@ -57,7 +57,7 @@ public class JMeterTreeTransferHandler e
jMeterTreeNodeDataFlavors[0] = nodeFlavor;
}
catch (ClassNotFoundException e) {
- LOG.error("Class Not Found", e);
+ log.error("Class Not Found", e);
}
}
@@ -216,7 +216,7 @@ public class JMeterTreeTransferHandler e
return guiInstance.getMainFrame().openJmxFilesFromDragAndDrop(t);
}
catch (Exception e) {
- LOG.error("Drop file failed", e);
+ log.error("Drop file failed", e);
}
return false;
}
@@ -282,7 +282,7 @@ public class JMeterTreeTransferHandler e
nodes = (JMeterTreeNode[]) t.getTransferData(nodeFlavor);
}
catch (Exception e) {
- LOG.error("Unsupported Flavor in Transferable", e);
+ log.error("Unsupported Flavor in Transferable", e);
}
return nodes;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java Fri Feb 10 21:29:25 2017
@@ -20,12 +20,12 @@
package org.apache.jmeter.gui.util;
import org.apache.jmeter.gui.action.ActionNames;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class IconToolbarBean {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(IconToolbarBean.class);
private static final String ICON_FIELD_SEP = ","; //$NON-NLS-1$
@@ -66,7 +66,7 @@ public final class IconToolbarBean {
try {
aName = (String) (ActionNames.class.getField(this.actionName).get(null));
} catch (Exception e) {
- log.warn("Toolbar icon Action names error: " + this.actionName + ", use unknown action."); //$NON-NLS-1$
+ log.warn("Toolbar icon Action names error: {}, use unknown action.", this.actionName); //$NON-NLS-1$
return this.actionName; // return unknown action names for display error msg
}
return aName;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Fri Feb 10 21:29:25 2017
@@ -51,15 +51,15 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jmeter.util.LocaleChangeEvent;
import org.apache.jmeter.util.LocaleChangeListener;
import org.apache.jmeter.util.SSLManager;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JMeterMenuBar extends JMenuBar implements LocaleChangeListener {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMeterMenuBar.class);
private JMenu fileMenu;
@@ -243,23 +243,19 @@ public class JMeterMenuBar extends JMenu
new Class[] {MenuCreator.class });
for (String strClassName : listClasses) {
try {
- if(log.isDebugEnabled()) {
- log.debug("Loading menu creator class: "+ strClassName);
- }
+ log.debug("Loading menu creator class: {}", strClassName);
Class<?> commandClass = Class.forName(strClassName);
if (!Modifier.isAbstract(commandClass.getModifiers())) {
- if(log.isDebugEnabled()) {
- log.debug("Instantiating: "+ commandClass.getName());
- }
+ log.debug("Instantiating: {}", commandClass);
MenuCreator creator = (MenuCreator) commandClass.newInstance();
menuCreators.add(creator);
}
} catch (Exception e) {
- log.error("Exception registering "+MenuCreator.class.getName() + " with implementation:"+strClassName, e);
+ log.error("Exception registering {} with implementation: {}", MenuCreator.class, strClassName, e);
}
}
} catch (IOException e) {
- log.error("Exception finding implementations of "+MenuCreator.class, e);
+ log.error("Exception finding implementations of {}", MenuCreator.class, e);
}
makeFileMenu();
@@ -401,7 +397,7 @@ public class JMeterMenuBar extends JMenu
if (addedLocales != null){
String [] addLanguages =addedLocales.split(","); // $NON-NLS-1$
for(String newLang : addLanguages){
- log.info("Adding locale "+newLang);
+ log.info("Adding locale {}", newLang);
lang.add(newLang);
}
}
@@ -582,7 +578,7 @@ public class JMeterMenuBar extends JMenu
}
public void setRunning(boolean running, String host) {
- log.info("setRunning(" + running + "," + host + ")");
+ log.info("setRunning({}, {})", running, host);
if(org.apache.jmeter.gui.MainFrame.LOCAL.equals(host)) {
return;
}
@@ -596,19 +592,27 @@ public class JMeterMenuBar extends JMenu
JMenuItem exit = iter3.next();
JMenuItem shut = iter4.next();
if (start.getText().equals(host)) {
- log.debug("Found start host: " + start.getText());
+ if (log.isDebugEnabled()) {
+ log.debug("Found start host: {}", start.getText());
+ }
start.setEnabled(!running);
}
if (stop.getText().equals(host)) {
- log.debug("Found stop host: " + stop.getText());
+ if (log.isDebugEnabled()) {
+ log.debug("Found stop host: {}", stop.getText());
+ }
stop.setEnabled(running);
}
if (exit.getText().equals(host)) {
- log.debug("Found exit host: " + exit.getText());
+ if (log.isDebugEnabled()) {
+ log.debug("Found exit host: {}", exit.getText());
+ }
exit.setEnabled(true);
}
if (shut.getText().equals(host)) {
- log.debug("Found exit host: " + exit.getText());
+ if (log.isDebugEnabled()) {
+ log.debug("Found shut host: {}", exit.getText());
+ }
shut.setEnabled(running);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Fri Feb 10 21:29:25 2017
@@ -37,8 +37,8 @@ import org.apache.jmeter.gui.action.Acti
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LocaleChangeEvent;
import org.apache.jmeter.util.LocaleChangeListener;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The JMeter main toolbar class
@@ -49,9 +49,9 @@ public class JMeterToolBar extends JTool
/**
*
*/
- private static final long serialVersionUID = -4591210341986068907L;
+ private static final long serialVersionUID = 1L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMeterToolBar.class);
private static final String TOOLBAR_ENTRY_SEP = ","; //$NON-NLS-1$
@@ -100,7 +100,9 @@ public class JMeterToolBar extends JTool
try {
toolBar.add(makeButtonItemRes(iconToolbarBean));
} catch (Exception e) {
- log.warn(e.getMessage());
+ if (log.isWarnEnabled()) {
+ log.warn("Exception while adding button item to toolbar. {}", e.getMessage());
+ }
}
}
}
@@ -166,14 +168,14 @@ public class JMeterToolBar extends JTool
List<IconToolbarBean> listIcons = new ArrayList<>();
for (String key : oList) {
- log.debug("Toolbar icon key: " + key); //$NON-NLS-1$
+ log.debug("Toolbar icon key: {}", key); //$NON-NLS-1$
String trimmed = key.trim();
if (trimmed.equals("|")) { //$NON-NLS-1$
listIcons.add(null);
} else {
String property = p.getProperty(trimmed);
if (property == null) {
- log.warn("No definition for toolbar entry: " + key);
+ log.warn("No definition for toolbar entry: {}", key);
} else {
try {
IconToolbarBean itb = new IconToolbarBean(property, iconSize);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Fri Feb 10 21:29:25 2017
@@ -23,11 +23,11 @@ import java.awt.HeadlessException;
import java.util.Properties;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.fife.ui.rtextarea.RUndoManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility class to handle RSyntaxTextArea code
@@ -36,7 +36,7 @@ import org.fife.ui.rtextarea.RUndoManage
*/
public class JSyntaxTextArea extends RSyntaxTextArea {
- private static final long serialVersionUID = 210L;
+ private static final long serialVersionUID = 211L;
private final Properties languageProperties = JMeterUtils.loadProperties("org/apache/jmeter/gui/util/textarea.properties"); //$NON-NLS-1$
@@ -47,7 +47,7 @@ public class JSyntaxTextArea extends RSy
private static final int MAX_UNDOS = JMeterUtils.getPropDefault("jsyntaxtextarea.maxundos", 50);
private static final String USER_FONT_FAMILY = JMeterUtils.getPropDefault("jsyntaxtextarea.font.family", null);
private static final int USER_FONT_SIZE = JMeterUtils.getPropDefault("jsyntaxtextarea.font.size", -1);
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSyntaxTextArea.class);
/**
* Creates the default syntax highlighting text area. The following are set:
@@ -184,7 +184,7 @@ public class JSyntaxTextArea extends RSy
int fontSize = USER_FONT_SIZE > 0 ? USER_FONT_SIZE : getFont().getSize();
setFont(new Font(USER_FONT_FAMILY, Font.PLAIN, fontSize));
if (log.isDebugEnabled()) {
- log.debug("Font is set to: " + getFont());
+ log.debug("Font is set to: {}", getFont());
}
}
if(disableUndo) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Fri Feb 10 21:29:25 2017
@@ -56,13 +56,13 @@ import org.apache.jmeter.testelement.Wor
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Printable;
import org.apache.jorphan.gui.GuiUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class MenuFactory {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(MenuFactory.class);
/*
* Predefined strings for makeMenu().
@@ -487,7 +487,7 @@ public final class MenuFactory {
}
if (elementsToSkip.contains(name)) { // No point instantiating class
- log.info("Skipping " + name);
+ log.info("Skipping {}", name);
continue;
}
@@ -504,27 +504,28 @@ public final class MenuFactory {
item = (JMeterGUIComponent) c.newInstance();
}
} catch (NoClassDefFoundError e) {
- log.warn("Configuration error, probably corrupt or missing third party library(jar) ? Could not create class:" + name + ". " + e,
- e);
+ log.warn(
+ "Configuration error, probably corrupt or missing third party library(jar) ? Could not create class: {}. {}",
+ name, e, e);
continue;
} catch(HeadlessException e) {
- log.warn("Could not instantiate class:" + name, e); // NOSONAR
+ log.warn("Could not instantiate class: {}", name, e); // NOSONAR
continue;
} catch(RuntimeException e) {
throw (RuntimeException) e;
} catch (Exception e) {
- log.warn("Could not instantiate class:" + name, e); // NOSONAR
+ log.warn("Could not instantiate class: {}", name, e); // NOSONAR
continue;
}
if (hideBean || elementsToSkip.contains(item.getStaticLabel())) {
- log.info("Skipping " + name);
+ log.info("Skipping {}", name);
continue;
} else {
elementsToSkip.add(name); // Don't add it again
}
Collection<String> categories = item.getMenuCategories();
if (categories == null) {
- log.debug(name + " participates in no menus.");
+ log.debug("{} participates in no menus.", name);
continue;
}
if (categories.contains(THREADS)) {
@@ -570,7 +571,7 @@ public final class MenuFactory {
}
} catch (IOException e) {
- log.error("", e);
+ log.error("IO Exception while initializing menus.", e);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java?rev=1782531&r1=1782530&r2=1782531&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java Fri Feb 10 21:29:25 2017
@@ -27,13 +27,13 @@ import javax.swing.event.TableModelEvent
import javax.swing.table.DefaultTableModel;
import org.apache.jorphan.collections.Data;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class PowerTableModel extends DefaultTableModel {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(PowerTableModel.class);
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
private Data model = new Data();
@@ -77,7 +77,7 @@ public class PowerTableModel extends Def
@Override
public void removeRow(int row) {
- log.debug("remove row: " + row);
+ log.debug("remove row: {}", row);
if (model.size() > row) {
log.debug("Calling remove row on Data");
model.removeRow(row);