You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/05/09 20:46:42 UTC
svn commit: r405497 - in /jakarta/jmeter/branches/rel-2-1/src:
components/org/apache/jmeter/assertions/
components/org/apache/jmeter/control/ components/org/apache/jmeter/modifiers/
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/contr...
Author: sebb
Date: Tue May 9 11:46:38 2006
New Revision: 405497
URL: http://svn.apache.org/viewcvs?rev=405497&view=rev
Log:
Remove unnecessary elses
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Tue May 9 11:46:38 2006
@@ -204,9 +204,8 @@
JMeterProperty type = getProperty(TEST_TYPE);
if (type instanceof NullProperty) {
return CONTAINS;
- } else {
- return type.getIntValue();
}
+ return type.getIntValue();
}
/***************************************************************************
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java Tue May 9 11:46:38 2006
@@ -109,10 +109,9 @@
if (context.getVariables().get(inputVariable) != null) {
log.debug("ForEach resultstring eofArgs= false");
return false;
- } else {
- log.debug("ForEach resultstring eofArgs= true");
- return true;
}
+ log.debug("ForEach resultstring eofArgs= true");
+ return true;
}
// Prevent entry if nothing to do
@@ -134,10 +133,9 @@
String inputVariable = getInputVal() + getSeparator() + "1";
if (context.getVariables().get(inputVariable) != null) {
return false;
- } else {
- log.debug("No entries found - null first entry: " + inputVariable);
- return true;
}
+ log.debug("No entries found - null first entry: " + inputVariable);
+ return true;
}
/*
@@ -151,9 +149,8 @@
// setDone(true);
resetLoopCount();
return null;
- } else {
- return next();
}
+ return next();
}
protected void incrementLoopCount() {
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java Tue May 9 11:46:38 2006
@@ -95,16 +95,15 @@
if (sampler == null) {
currentReturnedNull(controller);
return next();
+ }
+ currentReturnedAtLeastOne = true;
+ if (getStyle() == IGNORE_SUB_CONTROLLERS) {
+ incrementCurrent();
+ skipNext = true;
} else {
- currentReturnedAtLeastOne = true;
- if (getStyle() == IGNORE_SUB_CONTROLLERS) {
- incrementCurrent();
- skipNext = true;
- } else {
- searchStart = null;
- }
- return sampler;
+ searchStart = null;
}
+ return sampler;
}
/*
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java Tue May 9 11:46:38 2006
@@ -116,9 +116,8 @@
JMeterProperty prop = getProperty(NODE_PATH);
if (!(prop instanceof NullProperty)) {
return (List) ((CollectionProperty) prop).getObjectValue();
- } else {
- return null;
}
+ return null;
}
private void restoreSelected() {
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java Tue May 9 11:46:38 2006
@@ -165,9 +165,8 @@
protected int getExecutions() {
if (!isPerThread()) {
return globalNumExecutions;
- } else {
- return numExecutions;
}
+ return numExecutions;
}
private void increaseExecutions() {
@@ -184,9 +183,8 @@
protected int getIteration() {
if (!isPerThread()) {
return globalIteration;
- } else {
- return iteration;
}
+ return iteration;
}
private void increaseIteration() {
@@ -213,9 +211,8 @@
iterations = getIteration();
if (getStyle() == BYNUMBER) {
return executions < getMaxThroughputAsInt();
- } else {
- return (100.0 * executions + 50.0) / (iterations + 1) < getPercentThroughputAsFloat();
}
+ return (100.0 * executions + 50.0) / (iterations + 1) < getPercentThroughputAsFloat();
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java Tue May 9 11:46:38 2006
@@ -106,9 +106,8 @@
CollectionProperty threadValues = (CollectionProperty) getProperty(THREAD_VALUES);
if (threadValues.size() > 0) {
return (CollectionProperty) threadValues.get(getThreadContext().getThreadNum() % threadValues.size());
- } else {
- return new CollectionProperty("noname", new LinkedList());
}
+ return new CollectionProperty("noname", new LinkedList());
}
public boolean isPerIteration() {
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Tue May 9 11:46:38 2006
@@ -278,9 +278,8 @@
data[0][idx] = ((Number)model.getValueAt(idx,col)).doubleValue();
}
return data;
- } else {
- return new double[][]{ { 250, 45, 36, 66, 145, 80, 55 } };
}
+ return new double[][]{ { 250, 45, 36, 66, 145, 80, 55 } };
}
public String[] getAxisLabels() {
@@ -291,9 +290,8 @@
labels[idx] = (String)model.getValueAt(idx,0);
}
return labels;
- } else {
- return new String[]{ "/", "/samples", "/jsp-samples", "/manager", "/manager/status", "/hello", "/world" };
}
+ return new String[]{ "/", "/samples", "/jsp-samples", "/manager", "/manager/status", "/hello", "/world" };
}
/**
@@ -354,8 +352,7 @@
graphPanel.setBounds(graphPanel.getLocation().x,graphPanel.getLocation().y,
graphPanel.width,graphPanel.height);
return graphPanel;
- } else {
- return this;
}
+ return this;
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java Tue May 9 11:46:38 2006
@@ -146,13 +146,13 @@
*/
public Sampler next() {
boolean result = evaluateCondition(getCondition());
- if (result)
+ if (result) {
return super.next();
- else
- try {
- return nextIsNull();
- } catch (NextIsNullException e1) {
- return null;
- }
+ }
+ try {
+ return nextIsNull();
+ } catch (NextIsNullException e1) {
+ return null;
+ }
}
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java Tue May 9 11:46:38 2006
@@ -65,9 +65,8 @@
public boolean isDone() {
if (getRuntime() > 0 && getSubControllers().size() > 0) {
return super.isDone();
- } else {
- return true; // Runtime is zero - no point staying around
}
+ return true; // Runtime is zero - no point staying around
}
private boolean endOfLoop() {
@@ -95,9 +94,8 @@
if (endOfLoop()) {
resetLoopCount();
return null;
- } else {
- return next();
}
+ return next();
}
protected void incrementLoopCount() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java Tue May 9 11:46:38 2006
@@ -94,10 +94,9 @@
reInitialize();
if (!endOfLoop(true)) {
return super.next();
- } else {
- setDone(true);
- return null;
}
+ setDone(true);
+ return null;
}
/*
@@ -114,10 +113,9 @@
// Must be start of loop
if (!endOfLoop(false)) {
return super.next(); // OK to continue
- } else {
- reInitialize(); // Don't even start the loop
- return null;
}
+ reInitialize(); // Don't even start the loop
+ return null;
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java?rev=405497&r1=405496&r2=405497&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java Tue May 9 11:46:38 2006
@@ -121,9 +121,8 @@
StandardJMeterEngine.register((TestListener) function);
}
return function;
- } else {
- continue;
}
+ continue;
} else if (current[0] == '}') {
function = CompoundVariable.getNamedFunction(buffer.toString());
buffer.setLength(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org