Issue [RBO-13: Code compliance Java SE 7] fixed