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/03/07 19:56:50 UTC
svn commit: r1785877 - in /jmeter/trunk/src:
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/
core/org/apache/jmeter/functions/gui/ core/org/apache/jmeter/gui/
core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/gui/util/
core/or...
Author: pmouawad
Date: Tue Mar 7 19:56:50 2017
New Revision: 1785877
URL: http://svn.apache.org/viewvc?rev=1785877&view=rev
Log:
Misc clean up
Contributed by Benoit Wiart
This closes #280
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jmeter/trunk/src/core/org/apache/jmeter/SplashScreen.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jmeter/trunk/src/jorphan/org/apache/log/Priority.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java Tue Mar 7 19:56:50 2017
@@ -126,6 +126,7 @@ public class GraphVisualizer extends Abs
* @param s Sample
* @deprecated use {@link GraphVisualizer#add(SampleResult)} instead
*/
+ @Deprecated
public void updateGui(Sample s) {
JMeterUtils.runSafe(false, () -> updateGuiInAWTThread(s));
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Tue Mar 7 19:56:50 2017
@@ -96,12 +96,7 @@ public final class NewDriver {
new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "ext"),// $NON-NLS-1$ $NON-NLS-2$
new File(JMETER_INSTALLATION_DIRECTORY + File.separator + "lib" + File.separator + "junit")};// $NON-NLS-1$ $NON-NLS-2$
for (File libDir : libDirs) {
- File[] libJars = libDir.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {// only accept jar files
- return name.endsWith(".jar");// $NON-NLS-1$
- }
- });
+ File[] libJars = libDir.listFiles((FilenameFilter) (dir, name) -> name.endsWith(".jar"));
if (libJars == null) {
new Throwable("Could not access " + libDir).printStackTrace(); // NOSONAR No logging here
continue;
@@ -155,15 +150,12 @@ public final class NewDriver {
*/
private static File[] listJars(File dir) {
if (dir.isDirectory()) {
- return dir.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File f, String name) {
- if (name.endsWith(".jar")) {// $NON-NLS-1$
- File jar = new File(f, name);
- return jar.isFile() && jar.canRead();
- }
- return false;
+ return dir.listFiles((f, name) -> {
+ if (name.endsWith(".jar")) {// $NON-NLS-1$
+ File jar = new File(f, name);
+ return jar.isFile() && jar.canRead();
}
+ return false;
});
}
return new File[0];
Modified: jmeter/trunk/src/core/org/apache/jmeter/SplashScreen.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/SplashScreen.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/SplashScreen.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/SplashScreen.java Tue Mar 7 19:56:50 2017
@@ -54,11 +54,9 @@ public class SplashScreen extends JWindo
* Show screen
*/
public void showScreen() {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- setVisible(true);
- setAlwaysOnTop(true);
- }
+ SwingUtilities.invokeLater(() -> {
+ setVisible(true);
+ setAlwaysOnTop(true);
});
}
@@ -66,11 +64,9 @@ public class SplashScreen extends JWindo
* Close splash
*/
public void close() {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- setVisible(false);
- dispose();
- }
+ SwingUtilities.invokeLater(() -> {
+ setVisible(false);
+ dispose();
});
}
@@ -78,10 +74,6 @@ public class SplashScreen extends JWindo
* @param progress Loading progress
*/
public void setProgress(final int progress) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- progressBar.setValue(progress);
- }
- });
+ SwingUtilities.invokeLater(() -> progressBar.setValue(progress));
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Tue Mar 7 19:56:50 2017
@@ -23,7 +23,6 @@ import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import javax.swing.AbstractAction;
@@ -115,12 +114,7 @@ public class FunctionHelper extends JDia
private void initializeFunctionList() {
String[] functionNames = CompoundVariable.getFunctionNames();
- Arrays.sort(functionNames, new Comparator<String>() {
- @Override
- public int compare(String o1, String o2) {
- return o1.compareToIgnoreCase(o2);
- }
- });
+ Arrays.sort(functionNames, (o1, o2) -> o1.compareToIgnoreCase(o2));
functionList = new JLabeledChoice(JMeterUtils.getResString("choose_function"), functionNames); //$NON-NLS-1$
functionList.addChangeListener(this);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Tue Mar 7 19:56:50 2017
@@ -740,12 +740,7 @@ public final class GuiPackage implements
if (guiPack == null) {
return ;
}
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- JOptionPane.showMessageDialog(null,message,title,type);
- }
- });
+ SwingUtilities.invokeLater(() -> JOptionPane.showMessageDialog(null,message,title,type));
}
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=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Mar 7 19:56:50 2017
@@ -113,12 +113,7 @@ public class SavePropertyDialog extends
getContentPane().add(checkPanel, BorderLayout.NORTH);
JButton exit = new JButton(JMeterUtils.getResString("done")); // $NON-NLS-1$
this.getContentPane().add(exit, BorderLayout.SOUTH);
- exit.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
+ exit.addActionListener(e -> dispose());
}
@Override
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=1785877&r1=1785876&r2=1785877&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 Tue Mar 7 19:56:50 2017
@@ -56,13 +56,7 @@ public final class ActionRouter implemen
@Override
public void actionPerformed(final ActionEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- performAction(e);
- }
-
- });
+ SwingUtilities.invokeLater(() -> performAction(e));
}
private void performAction(final ActionEvent e) {
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=1785877&r1=1785876&r2=1785877&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 Tue Mar 7 19:56:50 2017
@@ -26,7 +26,6 @@ import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -362,14 +361,11 @@ public class Save extends AbstractAction
expiredFiles.addAll(FileFilterUtils.filterList(expiredFileFilter, backupFiles));
}
// sort backups from by their last modified time
- Collections.sort(backupFiles, new Comparator<File>() {
- @Override
- public int compare(File o1, File o2) {
- long diff = o1.lastModified() - o2.lastModified();
- // convert the long to an int in order to comply with the method
- // contract
- return diff < 0 ? -1 : diff > 0 ? 1 : 0;
- }
+ Collections.sort(backupFiles, (o1, o2) -> {
+ long diff = o1.lastModified() - o2.lastModified();
+ // convert the long to an int in order to comply with the method
+ // contract
+ return diff < 0 ? -1 : diff > 0 ? 1 : 0;
});
/**
* backup name is of the form
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FocusRequester.java Tue Mar 7 19:56:50 2017
@@ -30,11 +30,6 @@ import javax.swing.SwingUtilities;
public class FocusRequester {
public static void requestFocus(final Component comp) {
- SwingUtilities.invokeLater(new Runnable(){
- @Override
- public void run() {
- comp.requestFocusInWindow();
- }
- });
+ SwingUtilities.invokeLater(() -> comp.requestFocusInWindow());
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java Tue Mar 7 19:56:50 2017
@@ -166,12 +166,7 @@ public class JDateField extends JTextFie
pos = newDate.length();
}
final int newPosition = pos;
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- setCaretPosition(newPosition);// Restore position
- }
- });
+ SwingUtilities.invokeLater(() -> setCaretPosition(newPosition));
}
class KeyFocus extends KeyAdapter {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java Tue Mar 7 19:56:50 2017
@@ -98,15 +98,8 @@ public class CsvFileSampleSource extends
final Pattern pattern = Pattern.compile(inputRootName
+ "-[0-9]+\\." + inputExtension);
secondaryInputs = inputFile.getAbsoluteFile().getParentFile()
- .listFiles(new FileFilter() {
-
- @Override
- public boolean accept(File pathname) {
- return pathname.isFile()
- && pattern.matcher(pathname.getName())
- .matches();
- }
- });
+ .listFiles(pathname -> pathname.isFile()
+ && pattern.matcher(pathname.getName()).matches());
} catch (PatternSyntaxException e) {
throw new SampleException("Could not locate input sample files !",
e);
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java Tue Mar 7 19:56:50 2017
@@ -59,44 +59,6 @@ public class SaveGraphicsService {
super();
}
-/*
- * This is not currently used by JMeter code.
- * As it uses Sun-specific code (the only such in JMeter), it has been commented out for now.
- */
-// /**
-// * If someone wants to save a JPEG, use this method. There is a limitation
-// * though. It uses gray scale instead of color due to artifacts with color
-// * encoding. For some reason, it does not translate pure red and orange
-// * correctly. To make the text readable, gray scale is used.
-// *
-// * @param filename
-// * @param component
-// */
-// public void saveUsingJPEGEncoder(String filename, JComponent component) {
-// Dimension size = component.getSize();
-// // We use Gray scale, since color produces poor quality
-// // this is an unfortunate result of the default codec
-// // implementation.
-// BufferedImage image = new BufferedImage(size.width, size.height, BufferedImage.TYPE_USHORT_GRAY);
-// Graphics2D grp = image.createGraphics();
-// component.paint(grp);
-//
-// File outfile = new File(filename + JPEG_EXTENSION);
-// FileOutputStream fos = createFile(outfile);
-// JPEGEncodeParam param = JPEGCodec.getDefaultJPEGEncodeParam(image);
-// Float q = new Float(1.0);
-// param.setQuality(q.floatValue(), true);
-// JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(fos, param);
-//
-// try {
-// encoder.encode(image);
-// } catch (Exception e) {
-// log.warn(e.toString());
-// } finally {
-// JOrphanUtils.closeQuietly(fos);
-// }
-// }
-
/**
* Method will save the JComponent as an image. The formats are PNG, and
* TIFF.
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Tue Mar 7 19:56:50 2017
@@ -280,9 +280,6 @@ public class ThreadGroupGui extends Abst
// LOOP COUNT
threadPropsPanel.add(createControllerPanel());
- // mainPanel.add(threadPropsPanel, BorderLayout.NORTH);
- // add(mainPanel, BorderLayout.CENTER);
-
if (showDelayedStart) {
delayedStart = new JCheckBox(JMeterUtils.getResString("delayed_start")); // $NON-NLS-1$
threadPropsPanel.add(delayedStart);
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java Tue Mar 7 19:56:50 2017
@@ -27,12 +27,10 @@ import java.security.Provider;
import java.security.SecureRandom;
import java.security.cert.X509Certificate;
-import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509ExtendedKeyManager;
@@ -113,12 +111,7 @@ public class JsseSSLManager extends SSLM
}
HttpsURLConnection.setDefaultSSLSocketFactory(new HttpSSLProtocolSocketFactory(this, CPS));
- HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- });
+ HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true);
log.debug("SSL stuff all set");
} catch (GeneralSecurityException ex) {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java Tue Mar 7 19:56:50 2017
@@ -30,7 +30,6 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.util.JMeterStopThreadException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java Tue Mar 7 19:56:50 2017
@@ -22,7 +22,6 @@ import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@@ -141,19 +140,9 @@ public class JLabeledChoice extends JPan
// Register the handler for focus listening. This handler will
// only notify the registered when the text changes from when
// the focus is gained to when it is lost.
- choiceList.addItemListener(new ItemListener() {
- /**
- * Callback method when the focus to the Text Field component is
- * lost.
- *
- * @param e
- * The focus event that occured.
- */
- @Override
- public void itemStateChanged(ItemEvent e) {
- if (e.getStateChange() == ItemEvent.SELECTED) {
- notifyChangeListeners();
- }
+ choiceList.addItemListener(e -> {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ notifyChangeListeners();
}
});
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java Tue Mar 7 19:56:50 2017
@@ -271,18 +271,17 @@ public class ObjectTableModel extends De
boolean status = true;
for(int i=0;i<getColumnCount();i++){
Functor setMethod = writeFunctors.get(i);
- if (setMethod != null) {
- if (!setMethod.checkMethod(value,getColumnClass(i))){
+ if (setMethod != null
+ && !setMethod.checkMethod(value,getColumnClass(i))) {
status=false;
log.warn(caller.getName()+" is attempting to use nonexistent "+setMethod.toString());
- }
}
+
Functor getMethod = readFunctors.get(i);
- if (getMethod != null) {
- if (!getMethod.checkMethod(value)){
+ if (getMethod != null
+ && !getMethod.checkMethod(value)) {
status=false;
log.warn(caller.getName()+" is attempting to use nonexistent "+getMethod.toString());
- }
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Tue Mar 7 19:56:50 2017
@@ -19,7 +19,6 @@
package org.apache.jorphan.reflect;
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -149,12 +148,7 @@ public final class ClassFinder {
if (!path.endsWith(DOT_JAR)) {
File dir = new File(path);
if (dir.exists() && dir.isDirectory()) {
- String[] jars = dir.list(new FilenameFilter() {
- @Override
- public boolean accept(File f, String name) {
- return name.endsWith(DOT_JAR);
- }
- });
+ String[] jars = dir.list((f, name) -> name.endsWith(DOT_JAR));
if(jars != null) {
Collections.addAll(fullList, jars);
}
Modified: jmeter/trunk/src/jorphan/org/apache/log/Priority.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/log/Priority.java?rev=1785877&r1=1785876&r2=1785877&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/log/Priority.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/log/Priority.java Tue Mar 7 19:56:50 2017
@@ -125,6 +125,7 @@ public final class Priority
*
* @return the string describing priority
*/
+ @Override
public String toString()
{
return "Priority[" + getName() + "/" + getValue() + "]";