[GitHub] jmeter pull request #399: Fix undefined disabled icon

2018-09-19 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/jmeter/pull/399


---


[GitHub] jmeter pull request #399: Fix undefined disabled icon

2018-09-16 Thread tilln
GitHub user tilln opened a pull request:

https://github.com/apache/jmeter/pull/399

Fix undefined disabled icon

## Description
When a TestElement does not define a disabled icon, 
`JMeterTreeNode.getIcon(false)` returns null (via `GUIFactory.getIcon`).
This situation is incorrectly handled in 
`JMeterCellRenderer.getTreeCellRendererComponent`, though comments acknowledge 
the condition:
```
if (!enabled)// i.e. no disabled icon found
{
// Must therefore set the enabled icon so there is at least 
some
// icon
ic = node.getIcon();
if (ic != null) {
setIcon(ic);
}
```

## Motivation and Context
The above issue causes the wrong disabled icon to be displayed, e.g. when a 
TestElement defines its own icon via `BeanInfoSupport.setIcon`.

## How Has This Been Tested?
Tested with a locally patched class for JMeter v4.0 (Java 8, Windows 10), 
via manually disabling test plan elements.

## Screenshots (if appropriate):
![Wrong 
Icon](https://raw.githubusercontent.com/tilln/jmeter-wssecurity/issue/icon/docs/wrongicon.png)

## Types of changes
- Bug fix (non-breaking change which fixes an issue)

## Checklist:
- [x] My code follows the [code style][style-guide] of this project.
- [ ] I have updated the documentation accordingly.


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/tilln/jmeter trunk

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/jmeter/pull/399.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #399


commit f6f2e563d53bc602e8c203030a4ff43ff0253ce8
Author: Till Neunast 
Date:   2018-09-16T06:09:07Z

Fix undefined disabled icon




---