Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dmitry Trofimov
2014-05-21 18:42:19 +02:00
@@ -118,7 +118,8 @@ public class JavaValue extends XNamedValue implements NodeDescriptorProvider {
nodeIcon = AllIcons.Debugger.Watch;
}
else {
nodeIcon = AllIcons.Debugger.Value;
Icon icon = myValueDescriptor.getValueIcon();
nodeIcon = icon != null ? icon : AllIcons.Debugger.Value;
}
}
final String[] strings = splitValue(myValueDescriptor.getValueLabel());