--- C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java +++ C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java @@ -31,1 +31,0 @@ -import org.apache.jmeter.gui.GuiPackage; @@ -324,6 +323,0 @@ - - GuiPackage gp =GuiPackage.getInstance(); - if (gp != null) {// check there is a GUI - gp.getMainFrame().startTimer(); - } - @@ -459,3 +452,0 @@ - if (gp != null) {// check there is a GUI - gp.getMainFrame().stopTimer(); - } --- C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/gui/MainFrame.java +++ C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/gui/MainFrame.java @@ -45,2 +45,0 @@ -import java.text.SimpleDateFormat; -import java.util.Date; @@ -176,2 +174,0 @@ - - private JLabel timeRun; @@ -193,7 +189,0 @@ - - private javax.swing.Timer timer = new javax.swing.Timer(1000, new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent e) { - CalculTime(); - } - }); @@ -215,2 +204,0 @@ - - timeRun = new JLabel("00:00:00"); @@ -398,24 +385,0 @@ - // Calcul and display the elapse time of the loadtest - public void startTimer() { - timer.start(); - } - - public void stopTimer() { - timer.stop(); - } - - public void CalculTime() { - long currentTime = System.currentTimeMillis(); - long startTime = JMeterContextService.getTestStartTime(); - if (startTime == 0) - timer.stop(); - else - { - long elapse_time_ms = (currentTime - startTime); - Date elapse_date = new Date(elapse_time_ms); - SimpleDateFormat df = new java.text.SimpleDateFormat("HH:mm:ss"); - df.setTimeZone(java.util.TimeZone.getTimeZone("GMT")); - timeRun.setText(df.format(elapse_date)); - } - } - @@ -595,4 +558,0 @@ - - toolPanel.add(new JLabel(" ")); - toolPanel.add(timeRun); - toolPanel.add(new JLabel(" ")); --- C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/DistributedRunner.java +++ C:/perso_max/workspace/JMeter_2.12/src/core/org/apache/jmeter/engine/DistributedRunner.java @@ -35,1 +35,0 @@ -import org.apache.jmeter.gui.GuiPackage; @@ -130,6 +129,0 @@ - - GuiPackage gp =GuiPackage.getInstance(); - if (gp != null) {// check there is a GUI - gp.getMainFrame().startTimer(); - } - @@ -161,4 +154,0 @@ - GuiPackage gp =GuiPackage.getInstance(); - if (gp != null) {// check there is a GUI - gp.getMainFrame().stopTimer(); - } @@ -190,4 +179,0 @@ - GuiPackage gp =GuiPackage.getInstance(); - if (gp != null) {// check there is a GUI - gp.getMainFrame().stopTimer(); - } @@ -211,4 +196,0 @@ - GuiPackage gp =GuiPackage.getInstance(); - if (gp != null) {// check there is a GUI - gp.getMainFrame().stopTimer(); - }