Edit Computer refactored to jstl
bugFix DataSourceFactory