Author: tchemit Date: 2012-01-15 20:39:51 +0100 (Sun, 15 Jan 2012) New Revision: 281 Url: http://forge.codelutin.com/repositories/revision/echobase/281 Log: remove commented code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -79,16 +79,10 @@ model.setNbSteps(entries.length); -// List<EchoBaseEntityEnum> referenceTypes = -// Arrays.asList(EntitiesUtil.getReferenceTypes()); for (MetaFilenameAware entry : entries) { model.incrementsProgression(); -// if (!referenceTypes.contains(entry.getSource())) { -// // remove this when tests are ok. -// continue; -// } File entryFile = new File(dir, entry.getFilename()); if (entry instanceof AssociationMeta) { AssociationMeta associationMeta = (AssociationMeta) entry; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -142,21 +142,7 @@ DbEditorService service = getService(DbEditorService.class); TableMeta tableMeta = service.getTableMeta(associationMeta.getSource()); -// long s0 = TimeLog.getTime(); List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); -// List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, null); -// timeLog.log(s0, "prepareExport::getEntities"); -// s0 = TimeLog.getTime(); -// EntityOperator<TopiaEntity> operator = associationMeta.getOperator(); -// Iterator<TopiaEntity> itr = datas.iterator(); -// while (itr.hasNext()) { -// TopiaEntity entity = itr.next(); -// int size = operator.sizeChild(associationMeta.getName(), entity); -// if (size == 0) { -// itr.remove(); -// } -// } -// timeLog.log(s0, "prepareExport::removeEmptyChilds"); ExportModel<TopiaEntity> model = buildForExport(associationMeta); return Export.newExport(model, datas); }