Author: blavenier Date: 2013-02-01 16:13:51 +0100 (Fri, 01 Feb 2013) New Revision: 292 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/292 Log: - return empty list instead of null, in methods getAllBenthos, getAllPlancton, etc. (need for UI) - initialization multirigNumber and multirigAggregation to 1, when value not found in database (could only append when opening a cruise not filled with tutti) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -25,10 +25,14 @@ */ import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; +import com.google.common.collect.Lists; + import java.util.List; /** @@ -44,7 +48,10 @@ @Override public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { - return null; + List<AccidentalBatch> result = Lists.newArrayList(); + + // TODO + return result; } @Override Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -25,10 +25,14 @@ */ import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; +import com.google.common.collect.Lists; + import java.util.List; /** @@ -44,7 +48,10 @@ @Override public List<BenthosBatch> getAllBenthosBatch(String fishingOperationId) { - return null; + List<BenthosBatch> result = Lists.newArrayList(); + + // TODO + return result; } @Override Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -25,6 +25,7 @@ */ import java.sql.Timestamp; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -258,21 +259,26 @@ "pmfmIdTrawlNet", IntegerType.INSTANCE, enumeration.PMFM_ID_MULTIRIG_NUMBER); List<Gear> gears = Lists.newArrayList(); - int maxTrawlNetFound = 0; + int maxMultirigNumberFound = 0; while (list.hasNext()) { Object[] gearRow = list.next(); Gear target = referentialService.getGear((Integer) gearRow[0]); - Float trawlNet = (Float) gearRow[1]; - if (trawlNet != null && trawlNet.intValue() > maxTrawlNetFound) { - maxTrawlNetFound = trawlNet.intValue(); + Float multirigNumber = (Float) gearRow[1]; + if (multirigNumber != null && multirigNumber.intValue() > maxMultirigNumberFound) { + maxMultirigNumberFound = multirigNumber.intValue(); } gears.add(target); } result.setGear(gears); - if (maxTrawlNetFound > 0) { - result.setMultirigNumber(maxTrawlNetFound); + if (maxMultirigNumberFound > 0) { + result.setMultirigNumber(maxMultirigNumberFound); } } + // Force initialization of multirigNumber to 1 initialization (need for UI) + if (result.getMultirigNumber() == null){ + log.warn(MessageFormat.format("Cruise with id={0} has been load with a default multirigNumber=1, beacause not multirigNumber were found in database.", new Object[]{id})); + result.setMultirigNumber(1); + } return result; } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -26,6 +26,7 @@ import java.io.Serializable; import java.sql.Timestamp; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -186,7 +187,13 @@ if (multirigAggregation != null) { fishingOperation.setMultirigAggregation(multirigAggregation); } + // Force initialization to 1 initialization (need for UI) + else { + log.warn(MessageFormat.format("FishingOperation with id={0} has been load with a default multirigAggregation={1}, because no multirigAggregation were found in database.", new Object[]{fishingOperation.getId(), fishingOperation.getMultirigAggregation()})); + fishingOperation.setMultirigAggregation("1"); + } + fishingOperations.add(fishingOperation); } return fishingOperations; Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -25,10 +25,14 @@ */ import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; +import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; +import com.google.common.collect.Lists; + import java.util.List; /** @@ -44,7 +48,11 @@ @Override public List<MacroWasteBatch> getAllMacroWasteBatch(String fishingOperationId) { - return null; + List<MacroWasteBatch> result = Lists.newArrayList(); + + // TODO BL + + return result; } @Override Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-02-01 15:06:29 UTC (rev 291) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-02-01 15:13:51 UTC (rev 292) @@ -29,6 +29,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Service; +import com.google.common.collect.Lists; + import java.util.List; /** @@ -44,7 +46,11 @@ @Override public List<PlanktonBatch> getAllPlanktonBatch(String fishingOperationId) { - return null; + List<PlanktonBatch> result = Lists.newArrayList(); + + // TODO BL + + return result; } @Override