JBIDE-16931 CordovaSim: Refactoring