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 2016/12/21 17:04:49 UTC
svn commit: r1775510 - in
/jmeter/trunk/src/components/org/apache/jmeter/sampler: TestAction.java
gui/TestActionGui.java
Author: pmouawad
Date: Wed Dec 21 17:04:49 2016
New Revision: 1775510
URL: http://svn.apache.org/viewvc?rev=1775510&view=rev
Log:
Sonar : Fix code smells
Use Java8 lambda
Modified:
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1775510&r1=1775509&r2=1775510&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Wed Dec 21 17:04:49 2016
@@ -57,7 +57,6 @@ public class TestAction extends Abstract
// Action targets
public static final int THREAD = 0;
- // public static final int THREAD_GROUP = 1;
public static final int TEST = 2;
// Identifiers
@@ -65,7 +64,7 @@ public class TestAction extends Abstract
private static final String ACTION = "ActionProcessor.action"; //$NON-NLS-1$
private static final String DURATION = "ActionProcessor.duration"; //$NON-NLS-1$
- private volatile transient Thread pauseThread;
+ private transient volatile Thread pauseThread;
public TestAction() {
super();
@@ -91,8 +90,6 @@ public class TestAction extends Abstract
log.info("Restarting next loop");
context.setRestartNextLoop(true);
}
-// //Not yet implemented
-// } else if (target==THREAD_GROUP) {
} else if (target == TEST) {
if (action == STOP_NOW) {
log.info("Stopping all threads now");
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?rev=1775510&r1=1775509&r2=1775510&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java Wed Dec 21 17:04:49 2016
@@ -18,17 +18,12 @@
package org.apache.jmeter.sampler.gui;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JRadioButton;
import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.sampler.TestAction;
@@ -43,7 +38,6 @@ public class TestActionGui extends Abstr
// Gui components
private JComboBox<String> targetBox;
- // private ButtonGroup actionButtons;
private JRadioButton pauseButton;
private JRadioButton stopButton;
@@ -167,14 +161,11 @@ public class TestActionGui extends Abstr
targetModel.addElement(threadTarget);
targetModel.addElement(testTarget);
targetBox = new JComboBox<>(targetModel);
- targetBox.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (((String) targetBox.getSelectedItem()).equals(threadTarget)) {
- target = TestAction.THREAD;
- } else {
- target = TestAction.TEST;
- }
+ targetBox.addActionListener(evt -> {
+ if (((String) targetBox.getSelectedItem()).equals(threadTarget)) {
+ target = TestAction.THREAD;
+ } else {
+ target = TestAction.TEST;
}
});
targetPanel.add(targetBox);
@@ -184,50 +175,37 @@ public class TestActionGui extends Abstr
HorizontalPanel actionPanel = new HorizontalPanel();
ButtonGroup actionButtons = new ButtonGroup();
pauseButton = new JRadioButton(pauseAction, true);
- pauseButton.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (pauseButton.isSelected()) {
- action = TestAction.PAUSE;
- durationField.setEnabled(true);
- targetBox.setEnabled(true);
- }
-
+ pauseButton.addChangeListener(evt -> {
+ if (pauseButton.isSelected()) {
+ action = TestAction.PAUSE;
+ durationField.setEnabled(true);
+ targetBox.setEnabled(true);
}
});
stopButton = new JRadioButton(stopAction, false);
- stopButton.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (stopButton.isSelected()) {
- action = TestAction.STOP;
- durationField.setEnabled(false);
- targetBox.setEnabled(true);
- }
+ stopButton.addChangeListener(evt -> {
+ if (stopButton.isSelected()) {
+ action = TestAction.STOP;
+ durationField.setEnabled(false);
+ targetBox.setEnabled(true);
}
});
stopNowButton = new JRadioButton(stopNowAction, false);
- stopNowButton.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (stopNowButton.isSelected()) {
- action = TestAction.STOP_NOW;
- durationField.setEnabled(false);
- targetBox.setEnabled(true);
- }
+ stopNowButton.addChangeListener(evt -> {
+ if (stopNowButton.isSelected()) {
+ action = TestAction.STOP_NOW;
+ durationField.setEnabled(false);
+ targetBox.setEnabled(true);
}
});
restartNextLoopButton = new JRadioButton(restartNextLoopAction, false);
- restartNextLoopButton.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- if (restartNextLoopButton.isSelected()) {
- action = TestAction.RESTART_NEXT_LOOP;
- durationField.setEnabled(false);
- targetBox.setSelectedIndex(TestAction.THREAD);
- targetBox.setEnabled(false);
- }
+ restartNextLoopButton.addChangeListener(evt -> {
+ if (restartNextLoopButton.isSelected()) {
+ action = TestAction.RESTART_NEXT_LOOP;
+ durationField.setEnabled(false);
+ targetBox.setSelectedIndex(TestAction.THREAD);
+ targetBox.setEnabled(false);
}
});