Another code cleanup patch
I've run a newer version of pmd on the current source code and fixed two problems:
<collection>.size == 0 instead of <collection>.isEmpty()
and some constants were not declared final.
Two patch files are attached.
Xavier