LPS-44098

Hey Brian,

We saw your comment from https://github.com/brianchandotcom/liferay-portal/pull/16808#issuecomment-35749048.

I have refactored the logic in the java classes so it's easier to understand, reduce the probability of errors and it behaves as the original c:choose. Considering these changes I think that there is no need to have the c:choose in the jsp.

We want to have all the logic in one common place (the java class) and if we use c:choose in the jsps then we are also making a decision in the jsp so we may have one jsp that displays the delete link but other jsp that displays the move to recycle bin url. 

Thanks Brian!