Minor code cleanup and fix in MyListener
Test
Merge branch 'master' of
https://norbimona@github.com:443/s71v10/floorplan.git