Author: bleny Date: 2011-04-22 09:21:44 +0000 (Fri, 22 Apr 2011) New Revision: 1231 Log: clean code Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-22 09:20:41 UTC (rev 1230) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-04-22 09:21:44 UTC (rev 1231) @@ -235,9 +235,9 @@ if (log.isDebugEnabled()) { StringBuilder logMessage = new StringBuilder(); - logMessage.append("in data, for boat " + boat.getName() + " tides are :"); + logMessage.append("in data, for boat ").append(boat.getName()).append(" tides are :"); for (Map.Entry<String, List<Date>> codeAndTides : codesAndTides.entrySet()) { - logMessage.append(codeAndTides.getKey() + " -> " + codeAndTides.getValue()); + logMessage.append(codeAndTides.getKey()).append(" -> ").append(codeAndTides.getValue()); } log.debug(logMessage.toString()); } @@ -431,8 +431,6 @@ String nbObservantsRealProperty = TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_NB_OBSERVANTS); - String sampleRowEndProperty = - TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_PERIOD_END); String companyProperty = TopiaQuery.getProperty(sampleRowProperty, SampleRow.PROPERTY_COMPANY); String nbObservantsExpectedProperty = @@ -741,7 +739,7 @@ companyNumberOfReliableData.put(rowCompanyName, rowCount); } - if (reliability != DataReliability.UNKNOWN || reliability != DataReliability.NOT_PROVIDED) { + if (reliability != DataReliability.UNKNOWN && reliability != DataReliability.NOT_PROVIDED) { Long oldValue = companyNumberOfEvaluatedData.get(rowCompanyName); if (oldValue == null) { // it's a sum, so init to 0