cvs commit: jakarta-jmeter/src/core/org/apache/jmeter JMeter.java

sebb        2005/06/04 16:19:20

  Modified:    src/core/org/apache/jmeter JMeter.java
  Log:
  Fix up the TestPlan element for non-GUI test runs
 
  Revision  Changes    Path
  1.39      +9 -1      jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
 
  Index: JMeter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- JMeter.java 27 May 2005 23:10:34 -0000 1.38
  +++ JMeter.java 4 Jun 2005 23:19:20 -0000 1.39
  @@ -60,6 +60,7 @@
   import org.apache.jmeter.services.FileServer;
   import org.apache.jmeter.testelement.TestElement;
   import org.apache.jmeter.testelement.TestListener;
  +import org.apache.jmeter.testelement.TestPlan;
   import org.apache.jmeter.threads.gui.ThreadGroupGui;
   import org.apache.jmeter.timers.gui.AbstractTimerGui;
   import org.apache.jmeter.util.BeanShellServer;
  @@ -616,7 +617,14 @@
    {
    TestElement item = (TestElement) iter.next();
    if (item.isEnabled())
  - {//TODO handle ReplaceableControllers
  + {
  +                    // This is done for GUI runs in JMeterTreeModel.addSubTree()
  +                    if (item instanceof TestPlan) {
  +                        TestPlan tp = (TestPlan) item;
  +                        tp.setFunctionalMode(tp.isFunctionalMode());
  +                        tp.setSerialized(tp.isSerialized());
  +                    }
  +                    //TODO handle ReplaceableControllers
   // if (item instanceof ReplaceableController)
   // {
   // System.out.println("Replaceable "+item.getClass().getName());
 
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]