Java7 things

- diamond notation
- generified