Author: sebb Date: Sat May 17 00:38:56 2014 New Revision: 1595399 URL: http://svn.apache.org/r1595399 Log: Tab police
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/package.html jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java jmeter/trunk/src/core/org/apache/jmeter/images/icon.properties jmeter/trunk/src/core/org/apache/jmeter/images/icon_1.properties jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties jmeter/trunk/src/functions/org/apache/jmeter/functions/package.html Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/package.html URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/package.html?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/components/org/apache/jmeter/assertions/package.html (original) +++ jmeter/trunk/src/components/org/apache/jmeter/assertions/package.html Sat May 17 00:38:56 2014 @@ -19,15 +19,15 @@ */ --> <head> - <title>Assertions</title> + <title>Assertions</title> </head> <body> - <h1>Assertions</h1> - <h2>Methods to be implemented</h2> - getResult(SampleResult) - <h2>Calling sequence</h2> - <p>When the test plan is prepared for running, one instance of the class is created for each occurrence - of an assertion in each thread.</p> - <p>Assertions are called from the same thread as the sampler</p> + <h1>Assertions</h1> + <h2>Methods to be implemented</h2> + getResult(SampleResult) + <h2>Calling sequence</h2> + <p>When the test plan is prepared for running, one instance of the class is created for each occurrence + of an assertion in each thread.</p> + <p>Assertions are called from the same thread as the sampler</p> </body> </html> \ No newline at end of file Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original) +++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sat May 17 00:38:56 2014 @@ -347,7 +347,7 @@ implements ActionListener, TreeSelection selectRenderPanel.addItem(renderer); } else { log.warn("Missing (check spelling error in renderer name) or already added(check doublon) " + - "result renderer, check property 'view.results.tree.renderers_order', renderer name:'"+key+"'"); + "result renderer, check property 'view.results.tree.renderers_order', renderer name:'"+key+"'"); } } } Modified: jmeter/trunk/src/core/org/apache/jmeter/images/icon.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/images/icon.properties?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/images/icon.properties (original) +++ jmeter/trunk/src/core/org/apache/jmeter/images/icon.properties Sat May 17 00:38:56 2014 @@ -14,8 +14,8 @@ # limitations under the License. # Icon definition file. -# Key: (super) class names -# Value: icon, optionally followed by space and then the disabled icon name +# Key: (super) class names +# Value: icon, optionally followed by space and then the disabled icon name org.apache.jmeter.control.gui.TestPlanGui=org/apache/jmeter/images/beaker.gif org.apache.jmeter.timers.gui.AbstractTimerGui=org/apache/jmeter/images/timer.gif org.apache.jmeter.threads.gui.AbstractThreadGroupGui=org/apache/jmeter/images/thread.gif Modified: jmeter/trunk/src/core/org/apache/jmeter/images/icon_1.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/images/icon_1.properties?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/images/icon_1.properties (original) +++ jmeter/trunk/src/core/org/apache/jmeter/images/icon_1.properties Sat May 17 00:38:56 2014 @@ -14,8 +14,8 @@ # limitations under the License. # Icon definition file. -# Key: (super) class names -# Value: icon, optionally followed by space and then the disabled icon name +# Key: (super) class names +# Value: icon, optionally followed by space and then the disabled icon name org.apache.jmeter.control.gui.TestPlanGui=org/apache/jmeter/images/new/book.png org/apache/jmeter/images/new/book-grey.png org.apache.jmeter.timers.gui.AbstractTimerGui=org/apache/jmeter/images/new/clock.png org/apache/jmeter/images/new/clock-grey.png org.apache.jmeter.threads.gui.ThreadGroupGui=org/apache/jmeter/images/new/thread.png org/apache/jmeter/images/new/thread-grey.png Modified: jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties (original) +++ jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties Sat May 17 00:38:56 2014 @@ -17,8 +17,8 @@ toolbar=new,templates,open,close,save,save_as_testplan,|,cut,copy,paste,|,expand,collapse,toggle,|,test_start,test_start_notimers,test_stop,test_shutdown,|,test_start_remote_all,test_stop_remote_all,test_shutdown_remote_all,|,test_clear,test_clear_all,|,search,search_reset,|,function_helper,help # Icon / action definition file. -# Key: button names -# Value: I18N key in messages.properties, ActionNames key field, icon path, optionally followed by comma and then the pressed icon name +# Key: button names +# Value: I18N key in messages.properties, ActionNames key field, icon path, optionally followed by comma and then the pressed icon name new=new,CLOSE,org/apache/jmeter/images/toolbar/new.png templates=template_menu,TEMPLATES,org/apache/jmeter/images/toolbar/templates.png open=menu_open,OPEN,org/apache/jmeter/images/toolbar/open.png Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/package.html URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/package.html?rev=1595399&r1=1595398&r2=1595399&view=diff ============================================================================== --- jmeter/trunk/src/functions/org/apache/jmeter/functions/package.html (original) +++ jmeter/trunk/src/functions/org/apache/jmeter/functions/package.html Sat May 17 00:38:56 2014 @@ -19,23 +19,23 @@ */ --> <body> - <h1>Functions</h1> - <h2>Methods to be implemented</h2> - setParameters(Collection) - - <br></br> - execute(prevResult,currentSampler) - Note that either or both of the parameters may be null. - - <h2>Calling sequence</h2> - When the test plan is prepared for running, one instance of the class is created for each occurrence - of a function call. The setParameters() method is then called on each instance. - Once the test is running, the execute method can be called by any thread, and is - therefore synchronized. - - This is unlike most of (all?) the JMeter test elements, which are created for each thread. - - Any context that needs to be maintained for a thread must be done using ThreadLocal or similar. - + <h1>Functions</h1> + <h2>Methods to be implemented</h2> + setParameters(Collection) + + <br></br> + execute(prevResult,currentSampler) + Note that either or both of the parameters may be null. + + <h2>Calling sequence</h2> + When the test plan is prepared for running, one instance of the class is created for each occurrence + of a function call. The setParameters() method is then called on each instance. + Once the test is running, the execute method can be called by any thread, and is + therefore synchronized. + + This is unlike most of (all?) the JMeter test elements, which are created for each thread. + + Any context that needs to be maintained for a thread must be done using ThreadLocal or similar. + </body> </html> \ No newline at end of file