On 18 February 2016 at 12:56, <pmoua...@apache.org> wrote: > Author: pmouawad > Date: Thu Feb 18 12:56:21 2016 > New Revision: 1731062 > > URL: http://svn.apache.org/viewvc?rev=1731062&view=rev > Log: > #resolve #123
That does not say why the changes were committed; please ensure that the commit message has sufficient information for the reader to understand the commit. > Modified: > jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java > > jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java > jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java > > Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java > URL: > http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1731062&r1=1731061&r2=1731062&view=diff > ============================================================================== > --- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java > (original) > +++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Thu > Feb 18 12:56:21 2016 > @@ -218,21 +218,19 @@ public class JMeterToolBar extends JTool > * Init the state of buttons > */ > public void initButtonsState() { > - final boolean started = false; > Map<String, Boolean> buttonStates = new HashMap<>(); > - buttonStates.put(ActionNames.ACTION_START, > Boolean.valueOf(!started)); > - buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, > Boolean.valueOf(!started)); > - buttonStates.put(ActionNames.ACTION_STOP, Boolean.valueOf(started)); > - buttonStates.put(ActionNames.ACTION_SHUTDOWN, > Boolean.valueOf(started)); > + buttonStates.put(ActionNames.ACTION_START, Boolean.TRUE); > + buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.TRUE); > + buttonStates.put(ActionNames.ACTION_STOP, Boolean.FALSE); > + buttonStates.put(ActionNames.ACTION_SHUTDOWN, Boolean.FALSE); > buttonStates.put(ActionNames.UNDO, Boolean.FALSE); > buttonStates.put(ActionNames.REDO, Boolean.FALSE); > - buttonStates.put(ActionNames.REMOTE_START_ALL, > Boolean.valueOf(!started)); > - buttonStates.put(ActionNames.REMOTE_STOP_ALL, > Boolean.valueOf(started)); > - buttonStates.put(ActionNames.REMOTE_SHUT_ALL, > Boolean.valueOf(started)); > + buttonStates.put(ActionNames.REMOTE_START_ALL, Boolean.TRUE); > + buttonStates.put(ActionNames.REMOTE_STOP_ALL, Boolean.FALSE); > + buttonStates.put(ActionNames.REMOTE_SHUT_ALL, Boolean.FALSE); > updateButtons(buttonStates); > } > > - > /** > * Change state of buttons on local test > * > > Modified: > jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java > URL: > http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java?rev=1731062&r1=1731061&r2=1731062&view=diff > ============================================================================== > --- > jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java > (original) > +++ > jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java > Thu Feb 18 12:56:21 2016 > @@ -280,11 +280,10 @@ public abstract class AbstractVersusRequ > File tmpFile = File.createTempFile(parent.getName(), "-" > + String.valueOf(i), workDir); > tmpFile.deleteOnExit(); > - fileInfos > - .add(new FileInfo(tmpFile, > getConsumedMetadata(i))); > + fileInfos.add(new FileInfo(tmpFile, > getConsumedMetadata(i))); > } catch (IOException ex) { > String message = String.format( > - "Cannot create temporary file for channel #%s", > Integer.toString(i)); > + "Cannot create temporary file for channel #%d", > i); > log.error(message, ex); > throw new SampleException(message, ex); > } > > Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java > URL: > http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1731062&r1=1731061&r2=1731062&view=diff > ============================================================================== > --- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java > (original) > +++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Thu > Feb 18 12:56:21 2016 > @@ -570,9 +570,10 @@ public final class JOrphanUtils { > > /** > * @param elapsedSec long elapsed time in seconds > - * @return String formated with format HH:mm:ss > + * @return String formatted with format HH:mm:ss > */ > public static String formatDuration(long elapsedSec) { > - return String.format("%02d:%02d:%02d", Long.valueOf(elapsedSec / > 3600), Long.valueOf((elapsedSec % 3600) / 60), Long.valueOf(elapsedSec % 60)); > + return String.format("%02d:%02d:%02d", > + elapsedSec / 3600, (elapsedSec % 3600) / 60, elapsedSec % > 60); > } > } > >
