cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java

[sebb]

sebb        2004/12/18 11:07:02

  Modified:    src/core/org/apache/jmeter/threads/gui Tag: rel-2_0
                        ThreadGroupGui.java
  Log:
  Default start/end times to now if present in test plan;
  Default to 1 loop instead of forever
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.26.2.1  +12 -5     
jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
  
  Index: ThreadGroupGui.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
  retrieving revision 1.26
  retrieving revision 1.26.2.1
  diff -u -r1.26 -r1.26.2.1
  --- ThreadGroupGui.java       5 Mar 2004 01:37:12 -0000       1.26
  +++ ThreadGroupGui.java       18 Dec 2004 19:07:02 -0000      1.26.2.1
  @@ -165,8 +165,15 @@
               mainPanel.setVisible(false);
           }
   
  -        start.setDate(new 
Date(tg.getPropertyAsLong(ThreadGroup.START_TIME)));
  -        end.setDate(new Date(tg.getPropertyAsLong(ThreadGroup.END_TIME)));
  +        // Check if the property exists
  +        String s = tg.getPropertyAsString(ThreadGroup.START_TIME);
  +        if (s.length() == 0) {// Must be an old test plan
  +             start.setDate(new Date());
  +             end.setDate(new Date());
  +        } else {
  +            start.setDate(new 
Date(tg.getPropertyAsLong(ThreadGroup.START_TIME)));
  +            end.setDate(new 
Date(tg.getPropertyAsLong(ThreadGroup.END_TIME)));
  +        }
                duration.setText(tg.getPropertyAsString(ThreadGroup.DURATION));
                delay.setText(tg.getPropertyAsString(ThreadGroup.DELAY));
           
  @@ -212,7 +219,7 @@
       {
           loopPanel = new LoopControlPanel(false);
           LoopController looper = (LoopController) 
loopPanel.createTestElement();
  -        looper.setLoops(-1);
  +        looper.setLoops(1);
           loopPanel.configure(looper);
           return loopPanel;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]