fix TOOLS-2512, refactore EsbGraphicalShape class