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:34:46 UTC
svn commit: r1782534 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/
Author: pmouawad
Date: Fri Feb 10 21:34:45 2017
New Revision: 1782534
URL: http://svn.apache.org/viewvc?rev=1782534&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - core/gui package (2/2)
Contributed by Woonsan Ko
This closes #272
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java Fri Feb 10 21:34:45 2017
@@ -26,11 +26,11 @@ import javax.swing.JOptionPane;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
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;
public abstract class AbstractAction implements Command {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AbstractAction.class);
/**
* @see Command#doAction(ActionEvent)
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Fri Feb 10 21:34:45 2017
@@ -32,13 +32,13 @@ import javax.swing.SwingUtilities;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.jorphan.util.JMeterError;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class ActionRouter implements ActionListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ActionRouter.class);
// This is cheap, so no need to resort to IODH or lazy init
private static final ActionRouter INSTANCE = new ActionRouter();
@@ -71,7 +71,7 @@ public final class ActionRouter implemen
try {
GuiPackage.getInstance().updateCurrentGui();
} catch (Exception err){
- log.error("performAction(" + actionCommand + ") updateCurrentGui() on" + e.toString() + " caused", err);
+ log.error("performAction({}) updateCurrentGui() on{} caused", actionCommand, e, err);
JMeterUtils.reportErrorToUser("Problem updating GUI - see log file for details");
}
for (Command c : commands.get(actionCommand)) {
@@ -94,11 +94,11 @@ public final class ActionRouter implemen
}
JMeterUtils.reportErrorToUser(msg);
} catch (Exception err) {
- log.error("Error processing "+c.toString(), err);
+ log.error("Error processing {}", c, err);
}
}
} catch (NullPointerException er) {
- log.error("performAction(" + actionCommand + ") " + e.toString() + " caused", er);
+ log.error("performAction({}) {} caused", actionCommand, e, er);
JMeterUtils.reportErrorToUser("Sorry, this feature (" + actionCommand + ") not yet implemented");
}
}
@@ -317,7 +317,7 @@ public final class ActionRouter implemen
"org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - classname should not contain this string
false); // annotations - true if classnames are annotations
if (listClasses.isEmpty()) {
- log.fatalError("!!!!!Uh-oh, didn't find any action handlers!!!!!");
+ log.error("!!!!!Uh-oh, didn't find any action handlers!!!!!");
throw new JMeterError("No action handlers found - check JMeterHome and libraries");
}
for (String strClassName : listClasses) {
@@ -332,8 +332,10 @@ public final class ActionRouter implemen
commandObjects.add(command);
}
}
- } catch (HeadlessException e){
- log.warn(e.toString());
+ } catch (HeadlessException e) {
+ if (log.isWarnEnabled()) {
+ log.warn("AWT headless exception occurred. {}", e.toString());
+ }
} catch (Exception e) {
log.error("exception finding action handlers", e);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java Fri Feb 10 21:34:45 2017
@@ -26,14 +26,14 @@ import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
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;
/**
* Implements the Add Parent menu command
*/
public class AddParent extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AddParent.class);
private static final Set<String> commands = new HashSet<>();
@@ -53,7 +53,7 @@ public class AddParent extends AbstractA
TestElement controller = guiPackage.createTestElement(name);
addParentToTree(controller);
} catch (Exception err) {
- log.error("", err);
+ log.error("Exception while adding a TestElement.", err);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddThinkTimeBetweenEachStep.java Fri Feb 10 21:34:45 2017
@@ -31,15 +31,15 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.ThreadGroup;
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;
/**
* Add ThinkTime (TestAction + UniformRandomTimer)
* @since 3.2
*/
public class AddThinkTimeBetweenEachStep extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AddThinkTimeBetweenEachStep.class);
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java Fri Feb 10 21:34:45 2017
@@ -30,11 +30,11 @@ import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.testelement.TestElement;
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;
public class AddToTree extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(AddToTree.class);
private static final Set<String> commandSet;
@@ -71,7 +71,7 @@ public class AddToTree extends AbstractA
guiPackage.getNamingPolicy().nameOnCreation(node);
guiPackage.getMainFrame().getTree().setSelectionPath(new TreePath(node.getPath()));
} catch (Exception err) {
- log.error("", err); // $NON-NLS-1$
+ log.error("Exception while adding a component to tree.", err); // $NON-NLS-1$
String msg = err.getMessage();
if (msg == null) {
msg = err.toString();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ApplyNamingConvention.java Fri Feb 10 21:34:45 2017
@@ -28,15 +28,15 @@ import org.apache.jmeter.control.Control
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
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;
/**
* Allows to apply naming convention on nodes
* @since 3.2
*/
public class ApplyNamingConvention extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ApplyNamingConvention.class);
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Fri Feb 10 21:34:45 2017
@@ -25,9 +25,9 @@ import java.util.Locale;
import java.util.Set;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterError;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Change language
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
public class ChangeLanguage extends AbstractActionWithNoRunningTest {
private static final Set<String> commands = new HashSet<>();
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ChangeLanguage.class);
static {
commands.add(ActionNames.CHANGE_LANGUAGE);
@@ -55,7 +55,7 @@ public class ChangeLanguage extends Abst
} else {
loc = new Locale(locale, "");
}
- log.debug("Changing locale to " + loc.toString());
+ log.debug("Changing locale to {}", loc);
try {
JMeterUtils.setLocale(loc);
} catch (JMeterError err) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java Fri Feb 10 21:34:45 2017
@@ -36,14 +36,14 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.testelement.TestElement;
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;
/**
* Allows to change Controller implementation
*/
public class ChangeParent extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ChangeParent.class);
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Fri Feb 10 21:34:45 2017
@@ -32,15 +32,15 @@ import org.apache.jmeter.testelement.Wor
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.HashTreeTraverser;
import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Check if the TestPlan has been changed since it was last saved
*
*/
public class CheckDirty extends AbstractAction implements HashTreeTraverser, ActionListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CheckDirty.class);
private final Map<JMeterTreeNode, TestElement> previousGuiItems;
@@ -143,7 +143,9 @@ public class CheckDirty extends Abstract
*/
@Override
public void addNode(Object node, HashTree subTree) {
- log.debug("Node is class:" + node.getClass());
+ if (log.isDebugEnabled()) {
+ log.debug("Node is class: {}", node.getClass());
+ }
JMeterTreeNode treeNode = (JMeterTreeNode) node;
if (checkMode) {
// Only check if we have not found any differences so far
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Fri Feb 10 21:34:45 2017
@@ -26,8 +26,8 @@ import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.samplers.Clearable;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles the following actions:
@@ -36,7 +36,7 @@ import org.apache.log.Logger;
* - Reset (Clear GUI)
*/
public class Clear extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Clear.class);
private static final Set<String> commands = new HashSet<>();
@@ -75,7 +75,7 @@ public class Clear extends AbstractActio
try {
item.clearData();
} catch (Exception ex) {
- log.error("Can't clear: "+node+" "+guiComp, ex);
+ log.error("Can't clear: {} {}", node, guiComp, ex);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Fri Feb 10 21:34:45 2017
@@ -34,14 +34,14 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterTreeNodeTransferable;
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;
/**
* Implements the Copy menu command
*/
public class Copy extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Copy.class);
private static final HashSet<String> commands = new HashSet<>();
@@ -72,7 +72,7 @@ public class Copy extends AbstractAction
try {
return (JMeterTreeNode[]) clipboard.getData(JMeterTreeNodeTransferable.JMETER_TREE_NODE_ARRAY_DATA_FLAVOR);
} catch (Exception ex) {
- log.error("Clipboard node read error:" + ex.getMessage(), ex);
+ log.error("Clipboard node read error: {}", ex.getMessage(), ex);
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
@@ -119,7 +119,7 @@ public class Copy extends AbstractAction
transferable.setTransferData(nodes);
clipboard.setContents(transferable, null);
} catch (Exception ex) {
- log.error("Clipboard node read error:" + ex.getMessage(), ex);
+ log.error("Clipboard node read error: {}", ex.getMessage(), ex);
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java Fri Feb 10 21:34:45 2017
@@ -24,14 +24,14 @@ import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements the Enable menu item.
*/
public class EnableComponent extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(EnableComponent.class);
private static final Set<String> commands = new HashSet<>();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Fri Feb 10 21:34:45 2017
@@ -33,14 +33,14 @@ import org.apache.jmeter.gui.util.Escape
import org.apache.jmeter.swing.HtmlPane;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements the Help menu item.
*/
public class Help extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Help.class);
private static final Set<String> commands = new HashSet<>();
@@ -89,7 +89,7 @@ public class Help extends AbstractAction
try {
helpDoc.setPage(url.toString()); // N.B. this only reloads if necessary (ignores the reference)
} catch (IOException ioe) {
- log.error("Error setting page for url"+url, ioe);
+ log.error("Error setting page for url, {}", url, ioe);
helpDoc.setText("<html><head><title>Problem loading help page</title>"
+ "<style><!--"
+ ".note { background-color: #ffeeee; border: 1px solid brown; }"
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Fri Feb 10 21:34:45 2017
@@ -41,8 +41,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.WorkBench;
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;
import com.thoughtworks.xstream.converters.ConversionException;
@@ -51,7 +51,7 @@ import com.thoughtworks.xstream.converte
*
*/
public class Load extends AbstractActionWithNoRunningTest {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Load.class);
private static final boolean EXPAND_TREE = JMeterUtils.getPropDefault("onload.expandtree", false); //$NON-NLS-1$
@@ -118,9 +118,9 @@ public class Load extends AbstractAction
if (f != null) {
try {
if (merging) {
- log.info("Merging file: " + f);
+ log.info("Merging file: {}", f);
} else {
- log.info("Loading file: " + f);
+ log.info("Loading file: {}", f);
// TODO should this be done even if not a full test plan?
// and what if load fails?
if (setDetails) {
@@ -137,14 +137,16 @@ public class Load extends AbstractAction
guiPackage.setTestPlanFile(f.getAbsolutePath());
}
} catch (NoClassDefFoundError ex) {// Allow for missing optional jars
- reportError("Missing jar file", ex, true);
+ reportError("Missing jar file. {}", ex, true);
} catch (ConversionException ex) {
- log.warn("Could not convert file "+ex);
+ if (log.isWarnEnabled()) {
+ log.warn("Could not convert file. {}", ex.toString());
+ }
JMeterUtils.reportErrorToUser(SaveService.CEtoString(ex));
} catch (IOException ex) {
- reportError("Error reading file: ", ex, false);
+ reportError("Error reading file. {}", ex, false);
} catch (Exception ex) {
- reportError("Unexpected error", ex, true);
+ reportError("Unexpected error. {}", ex, true);
}
FileDialoger.setLastJFCDirectory(f.getParentFile().getAbsolutePath());
guiPackage.updateCurrentGui();
@@ -229,11 +231,13 @@ public class Load extends AbstractAction
}
// Helper method to simplify code
- private static void reportError(final String reason, final Throwable ex, final boolean stackTrace) {
- if (stackTrace) {
- log.warn(reason, ex);
- } else {
- log.warn(reason + ex);
+ private static void reportError(final String messageFormat, final Throwable ex, final boolean stackTrace) {
+ if (log.isWarnEnabled()) {
+ if (stackTrace) {
+ log.warn(messageFormat, ex.toString(), ex);
+ } else {
+ log.warn(messageFormat, ex.toString());
+ }
}
String msg = ex.getMessage();
if (msg == null) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Fri Feb 10 21:34:45 2017
@@ -30,15 +30,15 @@ import javax.swing.UIManager;
import org.apache.jmeter.gui.util.JMeterMenuBar;
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;
/**
* Implements the Look and Feel menu item.
*/
public class LookAndFeelCommand extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(LookAndFeelCommand.class);
private static final String JMETER_LAF = "jmeter.laf"; // $NON-NLS-1$
@@ -55,18 +55,18 @@ public class LookAndFeelCommand extends
for (UIManager.LookAndFeelInfo lf : lfs) {
commands.add(ActionNames.LAF_PREFIX + lf.getClassName());
}
- String jMeterLaf = getJMeterLaf();
if (log.isInfoEnabled()) {
+ final String jMeterLaf = getJMeterLaf();
List<String> names = new ArrayList<>();
for(UIManager.LookAndFeelInfo laf : lfs) {
if (laf.getClassName().equals(jMeterLaf)) {
names.add(laf.getName());
}
}
- if (names.size() > 0) {
- log.info("Using look and feel: "+jMeterLaf+ " " +names.toString());
+ if (!names.isEmpty()) {
+ log.info("Using look and feel: {} {}", jMeterLaf, names);
} else {
- log.info("Using look and feel: "+jMeterLaf);
+ log.info("Using look and feel: {}", jMeterLaf);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java Fri Feb 10 21:34:45 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.MenuFactory;
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;
/**
* Places a copied JMeterTreeNode under the selected node.
@@ -38,7 +38,7 @@ import org.apache.log.Logger;
*/
public class Paste extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Paste.class);
private static final Set<String> commands = new HashSet<>();
@@ -88,7 +88,7 @@ public class Paste extends AbstractActio
}
}
catch (IllegalUserActionException iuae) {
- log.error("", iuae); // $NON-NLS-1$
+ log.error("Illegal user action while adding a tree node.", iuae); // $NON-NLS-1$
JMeterUtils.reportErrorToUser(iuae.getMessage());
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Fri Feb 10 21:34:45 2017
@@ -55,8 +55,8 @@ import org.apache.jmeter.threads.ThreadG
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Save the current test plan; implements:
@@ -65,7 +65,7 @@ import org.apache.log.Logger;
* Save (Selection) As
*/
public class Save extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Save.class);
private static final List<File> EMPTY_FILE_LIST = Collections.emptyList();
@@ -209,13 +209,15 @@ public class Save extends AbstractAction
try {
expiredBackupFiles = createBackupFile(fileToBackup);
} catch (Exception ex) {
- log.error("Failed to create a backup for " + fileToBackup.getName(), ex); //$NON-NLS-1$
+ log.error("Failed to create a backup for {}", fileToBackup, ex); //$NON-NLS-1$
}
try {
convertSubTree(subTree);
} catch (Exception err) {
- log.warn("Error converting subtree "+err);
+ if (log.isWarnEnabled()) {
+ log.warn("Error converting subtree. {}", err.toString());
+ }
}
try (FileOutputStream ostream = new FileOutputStream(updateFile)){
@@ -235,14 +237,14 @@ public class Save extends AbstractAction
try {
FileUtils.deleteQuietly(expiredBackupFile);
} catch (Exception ex) {
- log.warn("Failed to delete backup file " + expiredBackupFile.getName()); //$NON-NLS-1$
+ log.warn("Failed to delete backup file, {}", expiredBackupFile); //$NON-NLS-1$
}
}
} catch(RuntimeException ex) {
throw ex;
}
catch (Exception ex) {
- log.error("Error saving tree:", ex);
+ log.error("Error saving tree.", ex);
throw new IllegalUserActionException("Couldn't save test plan to file: " + updateFile, ex);
}
@@ -321,7 +323,9 @@ public class Save extends AbstractAction
File backupDir = new File(BACKUP_DIRECTORY);
backupDir.mkdirs();
if (!backupDir.isDirectory()) {
- log.error("Could not backup file ! Backup directory does not exist, is not a directory or could not be created ! <" + backupDir.getAbsolutePath() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
+ log.error(
+ "Could not backup file ! Backup directory does not exist, is not a directory or could not be created ! <{}>", //$NON-NLS-1$
+ backupDir.getAbsolutePath()); //$NON-NLS-2$
}
/**
@@ -377,7 +381,7 @@ public class Save extends AbstractAction
try {
FileUtils.copyFile(fileToBackup, backupFile);
} catch (IOException e) {
- log.error("Failed to backup file :" + fileToBackup.getAbsolutePath(), e); //$NON-NLS-1$
+ log.error("Failed to backup file : {}", fileToBackup.getAbsolutePath(), e); //$NON-NLS-1$
return EMPTY_FILE_LIST;
}
// add the fresh new backup file (list is still sorted here)
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java Fri Feb 10 21:34:45 2017
@@ -52,8 +52,8 @@ import org.apache.jmeter.swing.HtmlPane;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.ComponentUtil;
import org.apache.jorphan.gui.JLabeledChoice;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Dialog used for Templates selection
@@ -61,7 +61,7 @@ import org.apache.log.Logger;
*/
public class SelectTemplatesDialog extends JDialog implements ChangeListener, ActionListener, HyperlinkListener {
- private static final long serialVersionUID = -4436834972710248247L;
+ private static final long serialVersionUID = 1;
// Minimal dimensions for dialog box
private static final int MINIMAL_BOX_WIDTH = 500;
@@ -71,7 +71,7 @@ public class SelectTemplatesDialog exten
private static final Font FONT_SMALL = new Font("SansSerif", Font.PLAIN, (int) Math.round(FONT_DEFAULT.getSize() * 0.8)); //$NON-NLS-1$
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SelectTemplatesDialog.class);
private final JLabeledChoice templateList = new JLabeledChoice(JMeterUtils.getResString("template_choose"), false); //$NON-NLS-1$
@@ -237,7 +237,7 @@ public class SelectTemplatesDialog exten
try {
java.awt.Desktop.getDesktop().browse(e.getURL().toURI());
} catch (Exception ex) {
- log.error("Error opening URL in browser:"+e.getURL());
+ log.error("Error opening URL in browser: {}", e.getURL());
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Fri Feb 10 21:34:45 2017
@@ -43,8 +43,8 @@ import org.apache.jmeter.timers.Timer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Set of Actions to:
@@ -60,7 +60,7 @@ import org.apache.log.Logger;
*/
public class Start extends AbstractAction {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Start.class);
private static final Set<String> commands = new HashSet<>();
@@ -111,13 +111,13 @@ public class Start extends AbstractActio
startEngine(true);
} else if (e.getActionCommand().equals(ActionNames.ACTION_STOP)) {
if (engine != null) {
- LOG.info("Stopping test");
+ log.info("Stopping test");
GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
engine.stopTest();
}
} else if (e.getActionCommand().equals(ActionNames.ACTION_SHUTDOWN)) {
if (engine != null) {
- LOG.info("Shutting test down");
+ log.info("Shutting test down");
GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
engine.askThreadsToStop();
}
@@ -136,7 +136,7 @@ public class Start extends AbstractActio
startEngine(noTimers, isValidation, tg);
}
else {
- LOG.warn("No thread group selected the test will not be started");
+ log.warn("No thread group selected the test will not be started");
}
}
}
@@ -191,8 +191,10 @@ public class Start extends AbstractActio
removeThreadGroupsFromHashTree(testTree, threadGroupsToRun);
}
testTree.add(testTree.getArray()[0], gui.getMainFrame());
- LOG.debug("test plan before cloning is running version: "
- + ((TestPlan) testTree.getArray()[0]).isRunningVersion());
+ if (log.isDebugEnabled()) {
+ log.debug("test plan before cloning is running version: {}",
+ ((TestPlan) testTree.getArray()[0]).isRunningVersion());
+ }
ListedHashTree clonedTree = null;
if(isValidationShot) {
@@ -211,8 +213,10 @@ public class Start extends AbstractActio
JOptionPane.showMessageDialog(gui.getMainFrame(), e.getMessage(),
JMeterUtils.getResString("error_occurred"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
}
- LOG.debug("test plan after cloning and running test is running version: "
- + ((TestPlan) testTree.getArray()[0]).isRunningVersion());
+ if (log.isDebugEnabled()) {
+ log.debug("test plan after cloning and running test is running version: {}",
+ ((TestPlan) testTree.getArray()[0]).isRunningVersion());
+ }
}
/**
@@ -225,9 +229,8 @@ public class Start extends AbstractActio
clazz = Class.forName(CLONER_FOR_VALIDATION_CLASS_NAME, true, Thread.currentThread().getContextClassLoader());
return (TreeCloner) clazz.newInstance();
} catch (InstantiationException | IllegalAccessException | ClassNotFoundException ex) {
- LOG.error("Error instanciating class:'"
- +CLONER_FOR_VALIDATION_CLASS_NAME+"' defined in property :'"
- +VALIDATION_CLONER_CLASS_PROPERTY_NAME+"'", ex);
+ log.error("Error instanciating class:'{}' defined in property:'{}'", CLONER_FOR_VALIDATION_CLASS_NAME,
+ VALIDATION_CLONER_CLASS_PROPERTY_NAME, ex);
return new TreeClonerForValidation();
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java?rev=1782534&r1=1782533&r2=1782534&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java Fri Feb 10 21:34:45 2017
@@ -29,11 +29,11 @@ import org.apache.jmeter.exceptions.Ille
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.HeapDumper;
-import org.apache.log.Logger;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -44,7 +44,7 @@ import org.apache.logging.log4j.core.con
*
*/
public class What extends AbstractAction {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(What.class);
private static final Set<String> commandSet;
@@ -66,13 +66,17 @@ public class What extends AbstractAction
String guiClassName = te.getPropertyAsString(TestElement.GUI_CLASS);
System.out.println(te.getClass().getName());
System.out.println(guiClassName);
- log.info("TestElement:"+te.getClass().getName()+", guiClassName:"+guiClassName);
- } else if (ActionNames.DEBUG_ON.equals(e.getActionCommand())){
- Configurator.setAllLevels(te.getClass().getName(), Level.DEBUG);
- log.info("Log level set to DEBUG for " + te.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("TestElement: {}, guiClassName: {}", te.getClass(), guiClassName);
+ }
+ } else if (ActionNames.DEBUG_ON.equals(e.getActionCommand())) {
+ final String loggerName = te.getClass().getName();
+ Configurator.setAllLevels(loggerName, Level.DEBUG);
+ log.info("Log level set to DEBUG for {}", loggerName);
} else if (ActionNames.DEBUG_OFF.equals(e.getActionCommand())){
- Configurator.setAllLevels(te.getClass().getName(), Level.INFO);
- log.info("Log level set to INFO for " + te.getClass().getName());
+ final String loggerName = te.getClass().getName();
+ Configurator.setAllLevels(loggerName, Level.INFO);
+ log.info("Log level set to INFO for {}", loggerName);
} else if (ActionNames.HEAP_DUMP.equals(e.getActionCommand())){
try {
String s = HeapDumper.dumpHeap();