Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 7:
    - creation of empty classes.

Change-Id: I339ce56273025e389bb0f1cb3cc8450eca62ee11