fix warnings with suggested casts; workaround may no longer be necessary under JDK 7 as resolved by JDK 6u23
fix unused warning by using window to get display
GDA-5899 (8.34) Cherry pick forgotten test file
Merge branch '8.34' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.34