replaced (String == String) with String.equals(String)