add intellij annotations, replace javafx pair by commons-lang3 pair