TDQ-9387:revert https://github.com/Talend/tcommon-studio-se/commit/6611614 and redo the refact code