Author: sebb Date: Sat May 9 13:55:03 2009 New Revision: 773224 URL: http://svn.apache.org/viewvc?rev=773224&view=rev Log: Bug 47176 - Monitor Results : improve load status graphic Also privatise items that are local to ServerPanel
Added: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-0.gif (with props) Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-legend.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-1.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-10.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-2.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-3.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-4.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-5.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-6.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-7.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-8.gif jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-9.gif jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-legend.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-legend.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Added: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-0.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-0.gif?rev=773224&view=auto ============================================================================== Binary file - no diff available. Propchange: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-0.gif ------------------------------------------------------------------------------ svn:mime-type = image/gif Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-1.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-1.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-10.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-10.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-2.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-2.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-3.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-3.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-4.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-4.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-5.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-5.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-6.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-6.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-7.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-7.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-8.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-8.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-9.gif URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-9.gif?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== Binary files - no diff available. Modified: jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java (original) +++ jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java Sat May 9 13:55:03 2009 @@ -49,36 +49,38 @@ /** * Health Icons */ - public static final ImageIcon HEALTHY = JMeterUtils.getImage("monitor-healthy.gif"); + private static final ImageIcon HEALTHY = JMeterUtils.getImage("monitor-healthy.gif"); - public static final ImageIcon ACTIVE = JMeterUtils.getImage("monitor-active.gif"); + private static final ImageIcon ACTIVE = JMeterUtils.getImage("monitor-active.gif"); - public static final ImageIcon WARNING = JMeterUtils.getImage("monitor-warning.gif"); + private static final ImageIcon WARNING = JMeterUtils.getImage("monitor-warning.gif"); - public static final ImageIcon DEAD = JMeterUtils.getImage("monitor-dead.gif"); + private static final ImageIcon DEAD = JMeterUtils.getImage("monitor-dead.gif"); /** * Load Icons */ - public static final ImageIcon LOAD_1 = JMeterUtils.getImage("monitor-load-1.gif"); + private static final ImageIcon LOAD_0 = JMeterUtils.getImage("monitor-load-0.gif"); - public static final ImageIcon LOAD_2 = JMeterUtils.getImage("monitor-load-2.gif"); + private static final ImageIcon LOAD_1 = JMeterUtils.getImage("monitor-load-1.gif"); - public static final ImageIcon LOAD_3 = JMeterUtils.getImage("monitor-load-3.gif"); + private static final ImageIcon LOAD_2 = JMeterUtils.getImage("monitor-load-2.gif"); - public static final ImageIcon LOAD_4 = JMeterUtils.getImage("monitor-load-4.gif"); + private static final ImageIcon LOAD_3 = JMeterUtils.getImage("monitor-load-3.gif"); - public static final ImageIcon LOAD_5 = JMeterUtils.getImage("monitor-load-5.gif"); + private static final ImageIcon LOAD_4 = JMeterUtils.getImage("monitor-load-4.gif"); - public static final ImageIcon LOAD_6 = JMeterUtils.getImage("monitor-load-6.gif"); + private static final ImageIcon LOAD_5 = JMeterUtils.getImage("monitor-load-5.gif"); - public static final ImageIcon LOAD_7 = JMeterUtils.getImage("monitor-load-7.gif"); + private static final ImageIcon LOAD_6 = JMeterUtils.getImage("monitor-load-6.gif"); - public static final ImageIcon LOAD_8 = JMeterUtils.getImage("monitor-load-8.gif"); + private static final ImageIcon LOAD_7 = JMeterUtils.getImage("monitor-load-7.gif"); - public static final ImageIcon LOAD_9 = JMeterUtils.getImage("monitor-load-9.gif"); + private static final ImageIcon LOAD_8 = JMeterUtils.getImage("monitor-load-8.gif"); - public static final ImageIcon LOAD_10 = JMeterUtils.getImage("monitor-load-10.gif"); + private static final ImageIcon LOAD_9 = JMeterUtils.getImage("monitor-load-9.gif"); + + private static final ImageIcon LOAD_10 = JMeterUtils.getImage("monitor-load-10.gif"); // private MonitorModel DATA; @@ -124,7 +126,7 @@ * @param health * @return image for the status */ - public static ImageIcon getHealthyImageIcon(int health) { + private static ImageIcon getHealthyImageIcon(int health) { ImageIcon i = null; switch (health) { case Stats.HEALTHY: @@ -149,8 +151,10 @@ * @param load * @return image for the load */ - public static ImageIcon getLoadImageIcon(int load) { - if (load <= 10) { + private static ImageIcon getLoadImageIcon(int load) { + if (load == 0) { + return LOAD_0; + } else if (load > 0 && load <= 10) { return LOAD_1; } else if (load > 10 && load <= 20) { return LOAD_2; Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=773224&r1=773223&r2=773224&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat May 9 13:55:03 2009 @@ -261,6 +261,7 @@ <li>Bug 46900 - Polish translations</li> <li>Bug 41209 - JLabeled* and ToolTips</li> <li>Add option to skip suffix generation in Save Responses to a File</li> +<li>Bug 47176 - Monitor Results : improve load status graphic</li> </ul> <h3>Non-functional changes</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org