Compatibility with older JDK.
Wrap each sample's config in a class for readability's sake.
Indentation.
Merge pull request #597 from fineswap/waypoints-sample-config

Wrap each sample's config in a class for readability's sake.
Merge pull request #596 from fineswap/source-1-5-compat

Compatibility with older JDK.