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/16 21:55:50 UTC
svn commit: r1783311 - in /jmeter/trunk/src/core/org/apache/jmeter:
JMeter.java gui/action/RemoteStart.java gui/action/Start.java
Author: pmouawad
Date: Thu Feb 16 21:55:50 2017
New Revision: 1783311
URL: http://svn.apache.org/viewvc?rev=1783311&view=rev
Log:
Tab police
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1783311&r1=1783310&r2=1783311&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu Feb 16 21:55:50 2017
@@ -273,7 +273,7 @@ public class JMeter implements JMeterPlu
private static final CLOptionDescriptor D_REPORT_OUTPUT_FOLDER_OPT =
new CLOptionDescriptor("reportoutputfolder",
CLOptionDescriptor.ARGUMENT_REQUIRED, REPORT_OUTPUT_FOLDER_OPT,
- "output folder for report dashboard");
+ "output folder for report dashboard");
private static final CLOptionDescriptor D_FORCE_DELETE_RESULT_FILE =
new CLOptionDescriptor("forceDeleteResultFile",
CLOptionDescriptor.ARGUMENT_DISALLOWED, FORCE_DELETE_RESULT_FILE,
@@ -854,8 +854,8 @@ public class JMeter implements JMeterPlu
remoteStop = true;
break;
case FORCE_DELETE_RESULT_FILE:
- deleteResultFile = true;
- break;
+ deleteResultFile = true;
+ break;
default:
// ignored
break;
@@ -941,16 +941,16 @@ public class JMeter implements JMeterPlu
convertSubTree(tree);
if (deleteResultFile) {
- SearchByClass<ResultCollector> resultListeners = new SearchByClass<>(ResultCollector.class);
- tree.traverse(resultListeners);
- Iterator<ResultCollector> irc = resultListeners.getSearchResults().iterator();
- while (irc.hasNext()) {
- ResultCollector rc = irc.next();
- File resultFile = new File(rc.getFilename());
- if (resultFile.exists()) {
- resultFile.delete();
- }
- }
+ SearchByClass<ResultCollector> resultListeners = new SearchByClass<>(ResultCollector.class);
+ tree.traverse(resultListeners);
+ Iterator<ResultCollector> irc = resultListeners.getSearchResults().iterator();
+ while (irc.hasNext()) {
+ ResultCollector rc = irc.next();
+ File resultFile = new File(rc.getFilename());
+ if (resultFile.exists()) {
+ resultFile.delete();
+ }
+ }
}
Summariser summer = null;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=1783311&r1=1783310&r2=1783311&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java Thu Feb 16 21:55:50 2017
@@ -76,15 +76,15 @@ public class RemoteStart extends Abstrac
popupShouldSave(e);
HashTree testTree = getTestTree();
if ( popupCheckExistingFileListener(testTree) ) {
- distributedRunner.init(Arrays.asList(name), testTree);
- distributedRunner.start(Arrays.asList(name));
+ distributedRunner.init(Arrays.asList(name), testTree);
+ distributedRunner.start(Arrays.asList(name));
}
} else if (action.equals(ActionNames.REMOTE_START_ALL)) {
popupShouldSave(e);
HashTree testTree = getTestTree();
if ( popupCheckExistingFileListener(testTree) ) {
- distributedRunner.init(getRemoteHosts(), testTree);
- distributedRunner.start();
+ distributedRunner.init(getRemoteHosts(), testTree);
+ distributedRunner.start();
}
} else if (action.equals(ActionNames.REMOTE_STOP_ALL)) {
distributedRunner.stop(getRemoteHosts());
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=1783311&r1=1783310&r2=1783311&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 Thu Feb 16 21:55:50 2017
@@ -206,18 +206,18 @@ public class Start extends AbstractActio
clonedTree = cloner.getClonedTree();
}
if ( popupCheckExistingFileListener(testTree) ) {
- engine = new StandardJMeterEngine();
- engine.configure(clonedTree);
- try {
- engine.runTest();
- } catch (JMeterEngineException e) {
- JOptionPane.showMessageDialog(gui.getMainFrame(), e.getMessage(),
- JMeterUtils.getResString("error_occurred"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
- }
- if (log.isDebugEnabled()) {
- log.debug("test plan after cloning and running test is running version: {}",
- ((TestPlan) testTree.getArray()[0]).isRunningVersion());
- }
+ engine = new StandardJMeterEngine();
+ engine.configure(clonedTree);
+ try {
+ engine.runTest();
+ } catch (JMeterEngineException e) {
+ JOptionPane.showMessageDialog(gui.getMainFrame(), e.getMessage(),
+ JMeterUtils.getResString("error_occurred"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("test plan after cloning and running test is running version: {}",
+ ((TestPlan) testTree.getArray()[0]).isRunningVersion());
+ }
}
}