Author: sebb Date: Thu May 7 23:43:01 2009 New Revision: 772817 URL: http://svn.apache.org/viewvc?rev=772817&view=rev Log: Reflow; add comments
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=772817&r1=772816&r2=772817&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu May 7 23:43:01 2009 @@ -800,51 +800,48 @@ if (item.isEnabled()) { if (item instanceof ReplaceableController) { // HACK: force the controller to load its tree - ReplaceableController rc = (ReplaceableController) item - .clone(); + ReplaceableController rc = (ReplaceableController) item.clone(); HashTree subTree = tree.getTree(item); if (subTree != null) { - HashTree replacementTree = rc - .getReplacementSubTree(); + HashTree replacementTree = rc.getReplacementSubTree(); if (replacementTree != null) { convertSubTree(replacementTree); tree.replace(item, rc); tree.set(rc, replacementTree); } - } else { + } else { // null subTree convertSubTree(tree.getTree(item)); } - } else { + } else { // not Replaceable Controller convertSubTree(tree.getTree(item)); } - } else { + } else { // Not enabled tree.remove(item); } - } else { + } else { // Not a TestElement JMeterTreeNode item = (JMeterTreeNode) o; if (item.isEnabled()) { // Replacement only needs to occur when starting the engine // @see StandardJMeterEngine.run() if (item.getUserObject() instanceof ReplaceableController) { - ReplaceableController rc = (ReplaceableController) item - .getTestElement(); + ReplaceableController rc = + (ReplaceableController) item.getTestElement(); HashTree subTree = tree.getTree(item); if (subTree != null) { - HashTree replacementTree = rc - .getReplacementSubTree(); + HashTree replacementTree = rc.getReplacementSubTree(); if (replacementTree != null) { convertSubTree(replacementTree); tree.replace(item, rc); tree.set(rc, replacementTree); } } - } else { + } else { // Not a ReplaceableController convertSubTree(tree.getTree(item)); TestElement testElement = item.getTestElement(); tree.replace(item, testElement); } - } else { + } else { // Not enabled tree.remove(item); } } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org