see #8902 - patch by shinigami
str != null && str.equals("CONST") => "CONST".equals(str)

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6089 0c6e7542-c601-0410-84e7-c038aed88b3b
see #8902 - long literals readability 4321l => 4321L (patch by shinigami)


git-svn-id: http://josm.openstreetmap.de/svn/trunk@6090 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror