Code clean-up  - Add final prompted by UCDetector  - Java 7 use of <>
Code clean-up
 - Add final prompted by UCDetector
 - Java 7 use of <>

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1360910 13f79535-47bb-0310-9956-ffa450edef68

apache/tomcat,apache/tomcat,apache/tomcat,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4,Nickname0806/Test_Q4,apache/tomcat,Nickname0806/Test_Q4