merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1579638 13f79535-47bb-0310-9956-ffa450edef68
fix some eclipse warnings

git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1579640 13f79535-47bb-0310-9956-ffa450edef68