Java Logic Assignment Complete