added java doc and minor changes
Authored by: samantprajakta 2014-03-12
Parent: [r1839]
Child: [r1841]
