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:19:44 UTC
svn commit: r1782530 - in /jmeter/trunk/src/core/org/apache/jmeter: save/
save/converters/ services/ swing/ testbeans/ testbeans/gui/
Author: pmouawad
Date: Fri Feb 10 21:19:43 2017
New Revision: 1782530
URL: http://svn.apache.org/viewvc?rev=1782530&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - core/samplers,save,services,swing,testbeans (2/2)
Contributed by Woonsan Ko
This closes #271
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Fri Feb 10 21:19:43 2017
@@ -46,22 +46,22 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.StatisticalSampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.Visualizer;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.Functor;
import org.apache.jorphan.util.JMeterError;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class provides a means for saving/reading test results as CSV files.
*/
// For unit tests, @see TestCSVSaveService
public final class CSVSaveService {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CSVSaveService.class);
// ---------------------------------------------------------------------
// XML RESULT FILE CONSTANTS AND FIELD NAME CONSTANTS
@@ -152,8 +152,7 @@ public final class CSVSaveService {
SampleSaveConfiguration saveConfig = CSVSaveService
.getSampleSaveConfiguration(line, filename);
if (saveConfig == null) {// not a valid header
- log.info(filename
- + " does not appear to have a valid header. Using default configuration.");
+ log.info("{} does not appear to have a valid header. Using default configuration.", filename);
saveConfig = (SampleSaveConfiguration) resultCollector
.getSaveConfig().clone(); // may change the format later
dataReader.reset(); // restart from beginning
@@ -213,7 +212,7 @@ public final class CSVSaveService {
try {
timeStamp = Long.parseLong(text); // see if this works
} catch (NumberFormatException e) { // it did not, let's try some other formats
- log.warn(e.toString());
+ log.warn("Cannot parse timestamp: '{}'", text);
boolean foundMatch = false;
for(String fmt : DATE_FORMAT_STRINGS) {
SimpleDateFormat dateFormat = new SimpleDateFormat(fmt);
@@ -223,12 +222,12 @@ public final class CSVSaveService {
timeStamp = stamp.getTime();
// method is only ever called from one thread at a time
// so it's OK to use a static DateFormat
- log.warn("Setting date format to: " + fmt);
+ log.warn("Setting date format to: {}", fmt);
saveConfig.setFormatter(dateFormat);
foundMatch = true;
break;
- } catch (ParseException e1) {
- log.info(text+" did not match "+fmt);
+ } catch (ParseException pe) {
+ log.info("{} did not match {}", text, fmt);
}
}
if (!foundMatch) {
@@ -367,18 +366,17 @@ public final class CSVSaveService {
}
if (i + saveConfig.getVarCount() < parts.length) {
- log.warn("Line: " + lineNumber + ". Found " + parts.length
- + " fields, expected " + i
- + ". Extra fields have been ignored.");
+ log.warn("Line: {}. Found {} fields, expected {}. Extra fields have been ignored.", lineNumber,
+ parts.length, i);
}
} catch (NumberFormatException | ParseException e) {
- log.warn("Error parsing field '" + field + "' at line "
- + lineNumber + " " + e);
+ if (log.isWarnEnabled()) {
+ log.warn("Error parsing field '{}' at line {}. {}", field, lineNumber, e.toString());
+ }
throw new JMeterError(e);
} catch (ArrayIndexOutOfBoundsException e) {
- log.warn("Insufficient columns to parse field '" + field
- + "' at line " + lineNumber);
+ log.warn("Insufficient columns to parse field '{}' at line {}", field, lineNumber);
throw new JMeterError(e);
}
return new SampleEvent(result, "", hostname);
@@ -620,9 +618,10 @@ public final class CSVSaveService {
}
if (delim != null) {
- log.warn("Default delimiter '" + _saveConfig.getDelimiter()
- + "' did not work; using alternate '" + delim
- + "' for reading " + filename);
+ if (log.isWarnEnabled()) {
+ log.warn("Default delimiter '{}' did not work; using alternate '{}' for reading {}",
+ _saveConfig.getDelimiter(), delim, filename);
+ }
saveConfig.setDelimiter(delim);
}
@@ -644,12 +643,11 @@ public final class CSVSaveService {
}
int current = headerLabelMethods.indexOf(label);
if (current == -1) {
- log.warn("Unknown column name " + label);
+ log.warn("Unknown column name {}", label);
return null; // unknown column name
}
if (current <= previous) {
- log.warn("Column header number " + (i + 1) + " name " + label
- + " is out of order.");
+ log.warn("Column header number {} name {} is out of order.", (i + 1), label);
return null; // out of order
}
previous = current;
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Fri Feb 10 21:19:43 2017
@@ -46,10 +46,10 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.NameUpdater;
import org.apache.jorphan.collections.HashTree;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterError;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.ConversionException;
@@ -69,7 +69,7 @@ import com.thoughtworks.xstream.mapper.M
*/
public class SaveService {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SaveService.class);
// Names of DataHolder entries for JTL processing
public static final String SAMPLE_EVENT_OBJECT = "SampleEvent"; // $NON-NLS-1$
@@ -159,7 +159,7 @@ public class SaveService {
private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
static {
- log.info("Testplan (JMX) version: "+VERSION_2_2+". Testlog (JTL) version: "+VERSION_2_2);
+ log.info("Testplan (JMX) version: {}. Testlog (JTL) version: {}", VERSION_2_2, VERSION_2_2);
initProps();
checkVersions();
}
@@ -171,12 +171,12 @@ public class SaveService {
for (String a : aliases){
Object old = aliasToClass.setProperty(a,clazz);
if (old != null){
- log.error("Duplicate class detected for "+alias+": "+clazz+" & "+old);
+ log.error("Duplicate class detected for {}: {} & {}", alias, clazz, old);
}
}
Object oldval=classToAlias.setProperty(clazz,alias);
if (oldval != null) {
- log.error("Duplicate alias detected for "+clazz+": "+alias+" & "+oldval);
+ log.error("Duplicate alias detected for {}: {} & {}", clazz, alias, oldval);
}
}
@@ -209,7 +209,7 @@ public class SaveService {
try {
fileVersion = getChecksumForPropertiesFile();
} catch (IOException | NoSuchAlgorithmException e) {
- log.fatalError("Can't compute checksum for saveservice properties file", e);
+ log.error("Can't compute checksum for saveservice properties file", e);
throw new JMeterError("JMeter requires the checksum of saveservice properties file to continue", e);
}
try {
@@ -224,13 +224,13 @@ public class SaveService {
// process special keys
if (key.equalsIgnoreCase("_version")) { // $NON-NLS-1$
propertiesVersion = val;
- log.info("Using SaveService properties version " + propertiesVersion);
+ log.info("Using SaveService properties version {}", propertiesVersion);
} else if (key.equalsIgnoreCase("_file_version")) { // $NON-NLS-1$
log.info("SaveService properties file version is now computed by a checksum,"
+ "the property _file_version is not used anymore and can be removed.");
} else if (key.equalsIgnoreCase("_file_encoding")) { // $NON-NLS-1$
fileEncoding = val;
- log.info("Using SaveService properties file encoding " + fileEncoding);
+ log.info("Using SaveService properties file encoding {}", fileEncoding);
} else {
key = key.substring(1);// Remove the leading "_"
try {
@@ -245,13 +245,13 @@ public class SaveService {
}
} catch (IllegalAccessException | InstantiationException | ClassNotFoundException | IllegalArgumentException|
SecurityException | InvocationTargetException | NoSuchMethodException e1) {
- log.warn("Can't register a converter: " + key, e1);
+ log.warn("Can't register a converter: {}", key, e1);
}
}
}
}
} catch (IOException e) {
- log.fatalError("Bad saveservice properties file", e);
+ log.error("Bad saveservice properties file", e);
throw new JMeterError("JMeter requires the saveservice properties file to continue");
}
}
@@ -391,7 +391,7 @@ public class SaveService {
try {
Class.forName(name, false, classLoader);
} catch (ClassNotFoundException e) {
- log.error("Unexpected entry in saveservice.properties; class does not exist and is not upgraded: "+name);
+ log.error("Unexpected entry in saveservice.properties; class does not exist and is not upgraded: {}", name);
missingClasses.add(name);
}
}
@@ -401,7 +401,7 @@ public class SaveService {
private static void checkVersions() {
if (!PROPVERSION.equalsIgnoreCase(propertiesVersion)) {
- log.warn("Bad _version - expected " + PROPVERSION + ", found " + propertiesVersion + ".");
+ log.warn("Bad _version - expected {}, found {}.", PROPVERSION, propertiesVersion);
}
}
@@ -430,7 +430,7 @@ public class SaveService {
* @throws IOException if there is a problem reading the file or processing it
*/
public static HashTree loadTree(File file) throws IOException {
- log.info("Loading file: " + file);
+ log.info("Loading file: {}", file);
try (InputStream inputStream = new FileInputStream(file);
BufferedInputStream bufferedInputStream =
new BufferedInputStream(inputStream)){
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java Fri Feb 10 21:19:43 2017
@@ -31,8 +31,8 @@ import java.util.Map;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.NameUpdater;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -43,7 +43,7 @@ import com.thoughtworks.xstream.io.Hiera
*
*/
public class ConversionHelp {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ConversionHelp.class);
private static final String CHAR_SET = StandardCharsets.UTF_8.name();
@@ -98,7 +98,7 @@ public class ConversionHelp {
String p1 = URLEncoder.encode(p, CHAR_SET);
return p1;
} catch (UnsupportedEncodingException e) {
- log.warn("System doesn't support " + CHAR_SET, e);
+ log.warn("System doesn't support {}", CHAR_SET, e);
return p;
}
}
@@ -121,7 +121,7 @@ public class ConversionHelp {
try {
return URLDecoder.decode(p, CHAR_SET);
} catch (UnsupportedEncodingException e) {
- log.warn("System doesn't support " + CHAR_SET, e);
+ log.warn("System doesn't support {}", CHAR_SET, e);
return p;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Fri Feb 10 21:19:43 2017
@@ -31,9 +31,9 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.save.SaveService;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.Converter;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -46,7 +46,7 @@ import com.thoughtworks.xstream.mapper.M
* XStream Converter for the SampleResult class
*/
public class SampleResultConverter extends AbstractCollectionConverter {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SampleResultConverter.class);
private static final String JAVA_LANG_STRING = "java.lang.String"; //$NON-NLS-1$
private static final String ATT_CLASS = "class"; //$NON-NLS-1$
@@ -470,7 +470,7 @@ public class SampleResultConverter exten
outstream.close();
res.setResponseData(outstream.toByteArray());
} catch (IOException e) {
- log.warn(e.getLocalizedMessage());
+ log.warn("Failed to read result file.", e);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Fri Feb 10 21:19:43 2017
@@ -24,8 +24,8 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.util.NameUpdater;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -35,7 +35,7 @@ import com.thoughtworks.xstream.io.Hiera
import com.thoughtworks.xstream.mapper.Mapper;
public class TestElementConverter extends AbstractCollectionConverter {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TestElementConverter.class);
/**
@@ -112,7 +112,7 @@ public class TestElementConverter extend
}
return el;
} catch (InstantiationException | IllegalAccessException e) {
- log.error("TestElement not instantiable: " + type, e);
+ log.error("TestElement not instantiable: {}", type, e);
return null;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java Fri Feb 10 21:19:43 2017
@@ -22,8 +22,8 @@ import org.apache.jmeter.config.ConfigTe
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -33,7 +33,7 @@ import com.thoughtworks.xstream.io.Hiera
import com.thoughtworks.xstream.mapper.Mapper;
public class TestElementPropertyConverter extends AbstractCollectionConverter {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TestElementPropertyConverter.class);
private static final String HEADER_CLASSNAME
= "org.apache.jmeter.protocol.http.control.Header"; // $NON-NLS-1$
Modified: jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java Fri Feb 10 21:19:43 2017
@@ -41,9 +41,9 @@ import org.apache.commons.collections.Ar
import org.apache.jmeter.gui.JMeterFileFilter;
import org.apache.jmeter.save.CSVSaveService;
import org.apache.jmeter.util.JMeterUtils;
-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;
/**
*
@@ -60,7 +60,7 @@ import org.apache.log.Logger;
*/
public class FileServer {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(FileServer.class);
/**
* The default base used for resolving relative files, i.e.<br/>
@@ -89,7 +89,7 @@ public class FileServer {
// Cannot be instantiated
private FileServer() {
base = new File(DEFAULT_BASE);
- log.info("Default base='"+DEFAULT_BASE+"'");
+ log.info("Default base='{}'", DEFAULT_BASE);
}
/**
@@ -105,7 +105,7 @@ public class FileServer {
public synchronized void resetBase() {
checkForOpenFiles();
base = new File(DEFAULT_BASE);
- log.info("Reset base to'"+base+"'");
+ log.info("Reset base to '{}'", base);
}
/**
@@ -124,7 +124,7 @@ public class FileServer {
newBase = newBase.getParentFile();
}
base = newBase;
- log.info("Set new base='"+base+"'");
+ log.info("Set new base='{}'", base);
}
}
@@ -159,7 +159,7 @@ public class FileServer {
}
checkForOpenFiles();
base = jmxBase;
- log.info("Set new base='"+base+"'");
+ log.info("Set new base='{}'", base);
}
/**
@@ -268,9 +268,9 @@ public class FileServer {
if (fileEntry == null) {
fileEntry = new FileEntry(resolveFileFromPath(filename), null, charsetName);
if (filename.equals(alias)){
- log.info("Stored: "+filename);
+ log.info("Stored: {}", filename);
} else {
- log.info("Stored: "+filename+" Alias: "+alias);
+ log.info("Stored: {} Alias: {}", filename, alias);
}
files.put(alias, fileEntry);
if (hasHeader) {
@@ -359,7 +359,7 @@ public class FileServer {
}
line = reader.readLine();
}
- if (log.isDebugEnabled()) { log.debug("Read:"+line); }
+ log.debug("Read:{}", line);
return line;
}
throw new IOException("File never reserved: "+filename);
@@ -450,7 +450,7 @@ public class FileServer {
throw new IOException("File " + filename + " already in use");
}
BufferedWriter writer = (BufferedWriter) fileEntry.inputOutputObject;
- if (log.isDebugEnabled()) { log.debug("Write:"+value); }
+ log.debug("Write:{}", value);
writer.write(value);
} else {
throw new IOException("File never reserved: "+filename);
@@ -488,7 +488,7 @@ public class FileServer {
private void closeFile(String name, FileEntry fileEntry) throws IOException {
if (fileEntry != null && fileEntry.inputOutputObject != null) {
- log.info("Close: "+name);
+ log.info("Close: {}", name);
fileEntry.inputOutputObject.close();
fileEntry.inputOutputObject = null;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/swing/HtmlPane.java Fri Feb 10 21:19:43 2017
@@ -24,16 +24,16 @@ import javax.swing.JTextPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements an HTML Pane with local hyperlinking enabled.
*/
public class HtmlPane extends JTextPane {
- 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(HtmlPane.class);
public HtmlPane() {
this.addHyperlinkListener(new HyperlinkListener() {
@@ -42,7 +42,7 @@ public class HtmlPane extends JTextPane
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
String ref = e.getURL().getRef();
if (ref != null) {
- log.debug("reference to scroll to = '" + ref + "'");
+ log.debug("reference to scroll to = '{}'", ref);
if (ref.length() > 0) {
scrollToReference(ref);
} else { // href="#"
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java Fri Feb 10 21:19:43 2017
@@ -31,8 +31,8 @@ import java.util.ResourceBundle;
import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
import org.apache.jmeter.testbeans.gui.TypeEditor;
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;
/**
* Support class for test bean beanInfo objects. It will help using the
@@ -62,7 +62,7 @@ import org.apache.log.Logger;
*/
public abstract class BeanInfoSupport extends SimpleBeanInfo {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BeanInfoSupport.class);
// Some known attribute names, just for convenience:
public static final String TAGS = GenericTestBeanCustomizer.TAGS;
@@ -134,7 +134,7 @@ public abstract class BeanInfoSupport ex
if (resourceBundle.containsKey(dnKey)) { // $NON-NLS-1$
getBeanDescriptor().setDisplayName(resourceBundle.getString(dnKey)); // $NON-NLS-1$
} else {
- log.debug("Localized display name not available for bean " + beanClass);
+ log.debug("Localized display name not available for bean {}", beanClass);
}
// Localize the property names and descriptions:
PropertyDescriptor[] properties = getPropertyDescriptors();
@@ -144,19 +144,19 @@ public abstract class BeanInfoSupport ex
if(resourceBundle.containsKey(propDnKey)) {
property.setDisplayName(resourceBundle.getString(propDnKey)); // $NON-NLS-1$
} else {
- log.debug("Localized display name not available for property " + name + " in " + beanClass);
+ log.debug("Localized display name not available for property {} in {}", name, beanClass);
}
final String propSdKey = name + ".shortDescription";
if(resourceBundle.containsKey(propSdKey)) {
property.setShortDescription(resourceBundle.getString(propSdKey));
} else {
- log.debug("Localized short description not available for property " + name + " in " + beanClass);
+ log.debug("Localized short description not available for property {} in {}", name, beanClass);
}
}
} catch (MissingResourceException e) {
- log.warn("Localized strings not available for bean " + beanClass, e);
+ log.warn("Localized strings not available for bean {}", beanClass, e);
} catch (Exception e) {
- log.warn("Something bad happened when loading bean info for bean " + beanClass, e);
+ log.warn("Something bad happened when loading bean info for bean {}", beanClass, e);
}
}
@@ -173,7 +173,7 @@ public abstract class BeanInfoSupport ex
return propdesc;
}
}
- log.error("Cannot find property: " + name + " in class " + beanClass);
+ log.error("Cannot find property: {} in class {}", name, beanClass);
return null;
}
@@ -244,9 +244,11 @@ public abstract class BeanInfoSupport ex
* property names in the desired order
*/
protected void createPropertyGroup(String group, String[] names) {
+ String name;
for (int i = 0; i < names.length; i++) { // i is used below
- log.debug("Getting property for: " + names[i]);
- PropertyDescriptor p = property(names[i]);
+ name = names[i];
+ log.debug("Getting property for: {}", name);
+ PropertyDescriptor p = property(name);
p.setValue(GenericTestBeanCustomizer.GROUP, group);
p.setValue(GenericTestBeanCustomizer.ORDER, Integer.valueOf(i));
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java Fri Feb 10 21:19:43 2017
@@ -34,9 +34,9 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.NullProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.Converter;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is an experimental class. An attempt to address the complexity of
@@ -49,7 +49,7 @@ import org.apache.log.Logger;
*
*/
public class TestBeanHelper {
- protected static final Logger log = LoggingManager.getLoggerForClass();
+ protected static final Logger log = LoggerFactory.getLogger(TestBeanHelper.class);
/**
* Prepare the bean for work by populating the bean's properties from the
@@ -67,13 +67,13 @@ public class TestBeanHelper {
PropertyDescriptor[] descs = beanInfo.getPropertyDescriptors();
if (log.isDebugEnabled()) {
- log.debug("Preparing " + el.getClass());
+ log.debug("Preparing {}", el.getClass());
}
for (PropertyDescriptor desc : descs) {
if (isDescriptorIgnored(desc)) {
if (log.isDebugEnabled()) {
- log.debug("Ignoring property '" + desc.getName() + "' in " + el.getClass().getCanonicalName());
+ log.debug("Ignoring property '{}' in {}", desc.getName(), el.getClass().getCanonicalName());
}
continue;
}
@@ -83,7 +83,7 @@ public class TestBeanHelper {
Object value = unwrapProperty(desc, jprop, type);
if (log.isDebugEnabled()) {
- log.debug("Setting " + jprop.getName() + "=" + value);
+ log.debug("Setting {}={}", jprop.getName(), value);
}
// Set the bean's property to the value we just obtained:
@@ -97,9 +97,9 @@ public class TestBeanHelper {
}
}
} catch (IntrospectionException e) {
- log.error("Couldn't set properties for " + el.getClass().getName(), e);
+ log.error("Couldn't set properties for {}", el.getClass(), e);
} catch (UnsatisfiedLinkError ule) { // Can occur running headless on Jenkins
- log.error("Couldn't set properties for " + el.getClass().getName());
+ log.error("Couldn't set properties for {}", el.getClass());
throw ule;
}
}
@@ -140,7 +140,7 @@ public class TestBeanHelper {
values.add(unwrapProperty(null, jMeterProperty, Class.forName(type)));
}
catch(Exception e) {
- log.error("Couldn't convert object: " + prop.getObjectValue() + " to " + type,e);
+ log.error("Couldn't convert object: {} to {}", prop.getObjectValue(), type, e);
}
}
return values;
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FieldStringEditor.java Fri Feb 10 21:19:43 2017
@@ -25,8 +25,6 @@ import java.beans.PropertyEditorSupport;
import javax.swing.JTextField;
-//import org.apache.jorphan.logging.LoggingManager;
-//import org.apache.log.Logger;
/**
* This class implements a property editor for non-null String properties that
@@ -37,7 +35,6 @@ import javax.swing.JTextField;
*
*/
class FieldStringEditor extends PropertyEditorSupport implements ActionListener, FocusListener {
-// private static final Logger log = LoggingManager.getLoggerForClass();
/**
* This will hold the text editing component, either a plain JTextField (in
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Fri Feb 10 21:19:43 2017
@@ -42,8 +42,8 @@ import org.apache.commons.lang3.ClassUti
import org.apache.jmeter.gui.ClearGui;
import org.apache.jmeter.testbeans.TestBeanHelper;
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;
/**
* The GenericTestBeanCustomizer is designed to provide developers with a
@@ -95,9 +95,9 @@ import org.apache.log.Logger;
* </dl>
*/
public class GenericTestBeanCustomizer extends JPanel implements SharedCustomizer {
- 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(GenericTestBeanCustomizer.class);
// Need to register Editors for Java classes because we cannot create them
// in the same package, nor can we create them in the built-in search patch of packages,
@@ -226,7 +226,7 @@ public class GenericTestBeanCustomizer e
// Don't get editors for hidden or non-read-write properties:
if (TestBeanHelper.isDescriptorIgnored(descriptor)) {
- log.debug("Skipping editor for property " + name);
+ log.debug("Skipping editor for property {}", name);
editors[i] = null;
continue;
}
@@ -241,10 +241,8 @@ public class GenericTestBeanCustomizer e
propertyEditor = new EnumEditor(descriptor, enumClass, (ResourceBundle) descriptor.getValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE));
} else {
Class<?> editorClass = descriptor.getPropertyEditorClass();
- if (log.isDebugEnabled()) {
- log.debug("Property " + name + " has editor class " + editorClass);
- }
-
+ log.debug("Property {} has editor class {}", name, editorClass);
+
if (editorClass != null) {
try {
propertyEditor = (PropertyEditor) editorClass.newInstance();
@@ -259,26 +257,21 @@ public class GenericTestBeanCustomizer e
}
if (propertyEditor == null) {
- log.warn("No editor for property: " + name
- + " type: " + descriptor.getPropertyType()
- + " in bean: " + beanInfo.getBeanDescriptor().getDisplayName()
- );
+ if (log.isWarnEnabled()) {
+ log.warn("No editor for property: {} type: {} in bean: {}", name, descriptor.getPropertyType(),
+ beanInfo.getBeanDescriptor().getDisplayName());
+ }
editors[i] = null;
continue;
}
- if (log.isDebugEnabled()) {
- log.debug("Property " + name + " has property editor " + propertyEditor);
- }
+ log.debug("Property {} has property editor {}", name, propertyEditor);
validateAttributes(descriptor, propertyEditor);
if (!propertyEditor.supportsCustomEditor()) {
propertyEditor = createWrapperEditor(propertyEditor, descriptor);
-
- if (log.isDebugEnabled()) {
- log.debug("Editor for property " + name + " is wrapped in " + propertyEditor);
- }
+ log.debug("Editor for property {} is wrapped in {}", name, propertyEditor);
}
if(propertyEditor instanceof TestBeanPropertyEditor)
{
@@ -328,30 +321,42 @@ public class GenericTestBeanCustomizer e
final Object deflt = pd.getValue(DEFAULT);
if (deflt == null) {
if (notNull(pd)) {
- log.warn(getDetails(pd) + " requires a value but does not provide a default.");
+ if (log.isWarnEnabled()) {
+ log.warn("{} requires a value but does not provide a default.", getDetails(pd));
+ }
}
if (noSaveDefault(pd)) {
- log.warn(getDetails(pd) + " specifies DEFAULT_NO_SAVE but does not provide a default.");
+ if (log.isWarnEnabled()) {
+ log.warn("{} specifies DEFAULT_NO_SAVE but does not provide a default.", getDetails(pd));
+ }
}
} else {
final Class<?> defltClass = deflt.getClass(); // the DEFAULT class
// Convert int to Integer etc:
final Class<?> propClass = ClassUtils.primitiveToWrapper(pd.getPropertyType());
if (!propClass.isAssignableFrom(defltClass) ){
- log.warn(getDetails(pd) + " has a DEFAULT of class " + defltClass.getCanonicalName());
+ if (log.isWarnEnabled()) {
+ log.warn("{} has a DEFAULT of class {}", getDetails(pd), defltClass.getCanonicalName());
+ }
}
}
if (notOther(pd) && pd.getValue(TAGS) == null && pe.getTags() == null) {
- log.warn(getDetails(pd) + " does not have tags but other values are not allowed.");
+ if (log.isWarnEnabled()) {
+ log.warn("{} does not have tags but other values are not allowed.", getDetails(pd));
+ }
}
if (!notNull(pd)) {
Class<?> propertyType = pd.getPropertyType();
if (propertyType.isPrimitive()) {
- log.warn(getDetails(pd) + " allows null but is a primitive type");
+ if (log.isWarnEnabled()) {
+ log.warn("{} allows null but is a primitive type", getDetails(pd));
+ }
}
}
if (!pd.attributeNames().hasMoreElements()) {
- log.warn(getDetails(pd) + " does not appear to have been configured");
+ if (log.isWarnEnabled()) {
+ log.warn("{} does not appear to have been configured", getDetails(pd));
+ }
}
}
@@ -501,7 +506,7 @@ public class GenericTestBeanCustomizer e
String name = descriptor.getName();
if (value != null) {
propertyMap.put(name, value);
- log.debug("Set " + name + "= " + value);
+ log.debug("Set {}={}", name, value);
}
firePropertyChange(name, null, value);
}
@@ -585,7 +590,7 @@ public class GenericTestBeanCustomizer e
}
if (log.isDebugEnabled()) {
- log.debug("Laying property " + descriptors[i].getName());
+ log.debug("Laying property {}", descriptors[i].getName());
}
String g = group(descriptors[i]);
@@ -763,14 +768,10 @@ public class GenericTestBeanCustomizer e
String name = descriptors[i].getName();
if (value == null) {
propertyMap.remove(name);
- if (log.isDebugEnabled()) {
- log.debug("Unset " + name);
- }
+ log.debug("Unset {}", name);
} else {
propertyMap.put(name, value);
- if (log.isDebugEnabled()) {
- log.debug("Set " + name + "= " + value);
- }
+ log.debug("Set {}={}", name, value);
}
}
}
@@ -795,7 +796,7 @@ public class GenericTestBeanCustomizer e
propertyEditor.setAsText("");
}
} catch (IllegalArgumentException ex){
- log.error("Failed to set field "+descriptors[i].getName(),ex);
+ log.error("Failed to set field {}", descriptors[i].getName(), ex);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java Fri Feb 10 21:19:43 2017
@@ -48,9 +48,9 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.ObjectTableModel;
-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;
/**
* Table editor for TestBean GUI properties.
@@ -60,7 +60,7 @@ import org.apache.log.Logger;
* </ul>
*/
public class TableEditor extends PropertyEditorSupport implements FocusListener,TestBeanPropertyEditor,TableModelListener, ClearGui {
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TableEditor.class);
/**
* attribute name for class name of a table row;
@@ -306,7 +306,7 @@ public class TableEditor extends Propert
removeButton.setEnabled(true);
clearButton.setEnabled(true);
} catch(Exception err) {
- LOG.error("The class type given to TableEditor was not instantiable. ", err);
+ log.error("The class type given to TableEditor was not instantiable.", err);
}
}
}
@@ -339,7 +339,7 @@ public class TableEditor extends Propert
downButton.setEnabled(false);
}
} catch (Exception err) {
- LOG.error("The class type given to TableEditor was not instantiable. ", err);
+ log.error("The class type given to TableEditor was not instantiable.", err);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Fri Feb 10 21:19:43 2017
@@ -65,9 +65,9 @@ import org.apache.jmeter.util.LocaleChan
import org.apache.jmeter.util.LocaleChangeListener;
import org.apache.jmeter.visualizers.Visualizer;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
-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;
/**
* JMeter GUI element editing for TestBean elements.
@@ -89,9 +89,9 @@ import org.apache.log.Logger;
*
*/
public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUIComponent, 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(TestBeanGUI.class);
private final Class<?> testBeanClass;
@@ -153,7 +153,7 @@ public class TestBeanGUI extends Abstrac
public TestBeanGUI(Class<?> testBeanClass) {
super();
- log.debug("testing class: " + testBeanClass.getName());
+ log.debug("testing class: {}", testBeanClass);
// A quick verification, just in case:
if (!TestBean.class.isAssignableFrom(testBeanClass)) {
Error e = new Error();
@@ -167,7 +167,7 @@ public class TestBeanGUI extends Abstrac
try {
beanInfo = Introspector.getBeanInfo(testBeanClass);
} catch (IntrospectionException e) {
- log.error("Can't get beanInfo for " + testBeanClass.getName(), e);
+ log.error("Can't get beanInfo for {}", testBeanClass, e);
throw new Error(e.toString()); // Programming error. Don't
// continue.
}
@@ -188,7 +188,7 @@ public class TestBeanGUI extends Abstrac
try {
return (Customizer) customizerClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
- log.error("Could not instantiate customizer of class " + customizerClass, e);
+ log.error("Could not instantiate customizer of {}", customizerClass, e);
throw new Error(e.toString());
}
}
@@ -246,11 +246,11 @@ public TestElement createTestElement() {
for (PropertyDescriptor desc : beanInfo.getPropertyDescriptors()) {
String name = desc.getName();
Object value = propertyMap.get(name);
- log.debug("Modify " + name + " to " + value);
+ log.debug("Modify {} to {}", name, value);
if (value == null) {
if (GenericTestBeanCustomizer.notNull(desc)) { // cannot be null
if (GenericTestBeanCustomizer.noSaveDefault(desc)) {
- log.debug("Did not set DEFAULT for " + name);
+ log.debug("Did not set DEFAULT for {}", name);
element.removeProperty(name);
} else {
setPropertyInElement(element, name, desc.getValue(GenericTestBeanCustomizer.DEFAULT));
@@ -260,7 +260,7 @@ public TestElement createTestElement() {
}
} else {
if (GenericTestBeanCustomizer.noSaveDefault(desc) && value.equals(desc.getValue(GenericTestBeanCustomizer.DEFAULT))) {
- log.debug("Did not set " + name + " to the default: " + value);
+ log.debug("Did not set {} to the default: {}", name, value);
element.removeProperty(name);
} else {
setPropertyInElement(element, name, value);
@@ -314,7 +314,7 @@ public TestElement createTestElement() {
return MenuFactory.getDefaultControllerMenu();
}
else {
- log.warn("Cannot determine PopupMenu for "+testBeanClass.getName());
+ log.warn("Cannot determine PopupMenu for {}", testBeanClass);
return MenuFactory.getDefaultMenu();
}
}
@@ -377,10 +377,10 @@ public TestElement createTestElement() {
int matches = setupGuiClasses(menuCategories);
if (matches == 0) {
- log.error("Could not assign GUI class to " + testBeanClass.getName());
+ log.error("Could not assign GUI class to {}", testBeanClass);
} else if (matches > 1) {// may be impossible, but no harm in
// checking ...
- log.error("More than 1 GUI class found for " + testBeanClass.getName());
+ log.error("More than 1 GUI class found for {}", testBeanClass);
}
return menuCategories;
}
@@ -504,7 +504,7 @@ public TestElement createTestElement() {
beanInfo = Introspector.getBeanInfo(testBeanClass);
setupGuiClasses();
} catch (IntrospectionException e) {
- log.error("Can't get beanInfo for " + testBeanClass.getName(), e);
+ log.error("Can't get beanInfo for {}", testBeanClass, e);
JMeterUtils.reportErrorToUser("Can't get beanInfo for " + testBeanClass.getName());
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=1782530&r1=1782529&r2=1782530&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java Fri Feb 10 21:19:43 2017
@@ -27,8 +27,8 @@ import javax.swing.JOptionPane;
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;
/**
* This is an implementation of a full-fledged property editor, providing both
@@ -54,7 +54,7 @@ import org.apache.log.Logger;
*
*/
class WrapperEditor extends PropertyEditorSupport implements PropertyChangeListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(WrapperEditor.class);
/** The type's property editor. */
private final PropertyEditor typeEditor;
@@ -308,7 +308,11 @@ class WrapperEditor extends PropertyEdit
}
if (log.isDebugEnabled()) {
- log.debug("->" + (value != null ? value.getClass().getName() : "NULL") + ":" + value);
+ if (value == null) {
+ log.debug("->NULL:null");
+ } else {
+ log.debug("->{}:{}", value.getClass().getName(), value);
+ }
}
return value;
}
@@ -318,7 +322,11 @@ class WrapperEditor extends PropertyEdit
String text;
if (log.isDebugEnabled()) {
- log.debug("<-" + (value != null ? value.getClass().getName() : "NULL") + ":" + value);
+ if (value == null) {
+ log.debug("<-NULL:null");
+ } else {
+ log.debug("<-{}:{}", value.getClass().getName(), value);
+ }
}
if (value == null) {
@@ -383,16 +391,18 @@ class WrapperEditor extends PropertyEdit
}
}
- if (log.isDebugEnabled()) {
- log.debug("->\"" + text + "\"");
- }
+ log.debug("->\"{}\"", text);
return text;
}
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (log.isDebugEnabled()) {
- log.debug(text == null ? "<-null" : "<-\"" + text + "\"");
+ if (text == null) {
+ log.debug("<-null");
+ } else {
+ log.debug("<-\"{}\"", text);
+ }
}
String value;
@@ -428,7 +438,7 @@ class WrapperEditor extends PropertyEdit
firePropertyChange();
} else {
if (GuiPackage.getInstance() == null){
- log.warn("Invalid value: "+text+" "+typeEditor);
+ log.warn("Invalid value: {} {}", text, typeEditor);
} else {
JOptionPane.showMessageDialog(guiEditor.getCustomEditor().getParent(),
JMeterUtils.getResString("property_editor.value_is_invalid_message"),//$NON-NLS-1$