Issue #149: got rid of 'add multiple' conditional flag and related code; fixed null pointer bug caused by last commit; moved code around in Editor class in preparation for refactoring
Issue #149: Editor no longer needs to implement EditorEventListener interface