Refactor

git-svn-id: http://primefaces.googlecode.com/svn/primefaces/trunk@10794 5a70e874-a5cb-11dd-8af2-493fb0bb9f7c
Bug fix

git-svn-id: http://primefaces.googlecode.com/svn/primefaces/trunk@10795 5a70e874-a5cb-11dd-8af2-493fb0bb9f7c