JDK7 dependencies

[Avinash Lakshman]

Hi All

The code should now be free of any dependency on JDK7 specific classes.
Please let us know is anything is amiss.

Avinash