1) changes to reflect refactorings in soot-infoflow
2) removed Java warnings