Switch: Clean up logic

[melloware]

Reported on the forums: https://forum.primefaces.org/viewtopic.php?f=14&t=39806

public enum FooEnum
{
    A, B
}

public Bean
{
    private FooEnum = A;
}

<pe:switch value="#{bean.fooEnum}" >
	<pe:case value="A">
		A
	</pe:case>
	<pe:case value="B">
		B
	</pe:case>
</pe:switch>

[tandraschko]

-1
pe:case value attr can be set to a enum via p:importEnum

[melloware]

it's a harmless change that tests for object equality and then if objects don't equal check for String representation equality. Plus it cleans up a mess of ==null != null logic.

Current code:

if ((caseComponent.getValue() == null && this.getValue() != null)
          || (this.getValue() == null && caseComponent.getValue() != null)) {
    continue;
}
if ((caseComponent.getValue() == null && this.getValue() == null)
            || caseComponent.getValue().equals(this.getValue())) {

     caseToRender = caseComponent;
     // mustn't break, because need to set rendered=false to other cases (e.g. for visitTree correctness)
}

New code (cleaner and catches this enum case):

Object evaluate = this.getValue();
Object caseValue = caseComponent.getValue();

if (ObjectUtils.equals(evaluate, caseValue) 
             || StringUtils.equalsIgnoreCase(String.valueOf(evaluate), String.valueOf(caseValue))) {
      caseToRender = caseComponent;
       // must not break, because need to set rendered=false to other cases (e.g. for visitTree correctness)
}

[tandraschko]

I wouldnt do it personally. A string is not a enum, i introduced importEnum long time ago for this cases.
It would be just ok for me if JSF will do the same for action listeners, if you pass a string and the method param is a enum.

[melloware]

OK I can live with that. I switched it to just this which does exactly the same as the original code with 1 line of code and not confusing "continue" statement etc.

final Object evaluate = this.getValue();
final Object caseValue = caseComponent.getValue();

 // TODO: switch this to Objects.equals in Java7
if (ObjectUtils.equals(evaluate, caseValue))) {
    caseToRender = caseComponent;
 }