- Coser-commits - mailman.cloud.codelutin.com

r1065 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 24, 2012

Aug. 24, 2012

Author: echatellier Date: 2012-08-24 13:52:37 +0200 (Fri, 24 Aug 2012) New Revision: 1065 Url: http://forge.codelutin.com/repositories/revision/coser/1065 Log: Fix update process and generated mail content Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-24 11:52:37 UTC (rev 1065) @@ -707,15 +707,21 @@ File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); File mapsDirectory = config.getWebMapsProjectsDirectory(); + // recuperer les resultats actuels pour le mail de mise à jour + Map<String, String> indicatorResults = getZonesIds(projectsDirectory, true, null, null); + Map<String, String> mapsResults = getZonesIds(mapsDirectory, null, true, null); + Map<String, String> dataResults = getZonesIds(projectsDirectory, null, null, true); + // suppression des resultats qui ont été envoyé mais // ne sont ni maps result, ni indicator result - Map<String, String> noIndicatorsResultZoneIds = getZonesIds(tempDirectory, false, null); + Map<String, String> noIndicatorsResultZoneIds = getZonesIds(tempDirectory, false, null, null); cleanCurrentProjectDirectory(projectsDirectory, noIndicatorsResultZoneIds.keySet()); - Map<String, String> noMapsResultZoneIds = getZonesIds(tempDirectory, null, false); + Map<String, String> noMapsResultZoneIds = getZonesIds(tempDirectory, null, false, null); cleanCurrentProjectDirectory(mapsDirectory, noMapsResultZoneIds.keySet()); + Map<String, String> noDataResultZoneIds = getZonesIds(tempDirectory, null, null, false); // recuperation des noms zone des nouveau fichiers - Map<String, String> indicatorsResultZoneIds = getZonesIds(tempDirectory, true, false); + Map<String, String> indicatorsResultZoneIds = getZonesIds(tempDirectory, true, null, null); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(projectsDirectory, indicatorsResultZoneIds.keySet()); @@ -725,7 +731,7 @@ customCopyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); // recuperation des noms zone des nouveau fichiers - Map<String, String> mapsResultZoneIds = getZonesIds(tempDirectory, false, true); + Map<String, String> mapsResultZoneIds = getZonesIds(tempDirectory, null, true, null); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(mapsDirectory, mapsResultZoneIds.keySet()); @@ -734,6 +740,9 @@ // copie (avec ecrasement) des nouveaux fichiers dans l'ancien répertoire customCopyDirectory(tempDirectory, mapsDirectory, mapsFileFilter); + // recuperation des nom de resultat data + Map<String, String> dataResultZoneIds = getZonesIds(tempDirectory, null, null, true); + FileUtils.deleteDirectory(tempDirectory); if (log.isInfoEnabled()) { @@ -741,40 +750,69 @@ } // generate email content - StringBuffer content = new StringBuffer(); - if (!noMapsResultZoneIds.isEmpty() || !mapsResultZoneIds.isEmpty()) { - content.append(_("coser.business.notificationmail.mapsresults") + "\n"); - for (Map.Entry<String, String> noMapsResultZoneId : noMapsResultZoneIds.entrySet()) { + StringBuilder content = new StringBuilder(); + + int count = 0; + content.append(_("coser.business.notificationmail.mapsresults") + "\n"); + for (Map.Entry<String, String> noMapsResultZoneId : noMapsResultZoneIds.entrySet()) { + if (mapsResults.containsValue(noMapsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.deleted", - getZoneFullName(noMapsResultZoneId.getKey()), - noMapsResultZoneId.getValue()) + "\n"); + getZoneFullName(noMapsResultZoneId.getKey()), + noMapsResultZoneId.getValue()) + "\n"); + count++; } - for (Map.Entry<String, String> mapsResultZoneId : mapsResultZoneIds.entrySet()) { + } + for (Map.Entry<String, String> mapsResultZoneId : mapsResultZoneIds.entrySet()) { + if (!mapsResults.containsValue(mapsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.added", - getZoneFullName(mapsResultZoneId.getKey()), - mapsResultZoneId.getValue()) + "\n"); + getZoneFullName(mapsResultZoneId.getKey()), + mapsResultZoneId.getValue()) + "\n"); + count++; } - content.append("\n"); } - - if (!noIndicatorsResultZoneIds.isEmpty() || !indicatorsResultZoneIds.isEmpty()) { - content.append(_("coser.business.notificationmail.indicatorsresults") + "\n"); - for (Map.Entry<String, String> noIndicatorsResultZoneId : noIndicatorsResultZoneIds.entrySet()) { + content.append("\n"); + + content.append(_("coser.business.notificationmail.indicatorsresults") + "\n"); + for (Map.Entry<String, String> noIndicatorsResultZoneId : noIndicatorsResultZoneIds.entrySet()) { + if (indicatorResults.containsValue(noIndicatorsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.deleted", - getZoneFullName(noIndicatorsResultZoneId.getKey()), - noIndicatorsResultZoneId.getValue()) + "\n"); + getZoneFullName(noIndicatorsResultZoneId.getKey()), + noIndicatorsResultZoneId.getValue()) + "\n"); + count++; } - for (Map.Entry<String, String> indicatorsResultZoneId : indicatorsResultZoneIds.entrySet()) { + + } + for (Map.Entry<String, String> indicatorsResultZoneId : indicatorsResultZoneIds.entrySet()) { + if (!indicatorResults.containsValue(indicatorsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.added", - getZoneFullName(indicatorsResultZoneId.getKey()), - indicatorsResultZoneId.getValue()) + "\n"); + getZoneFullName(indicatorsResultZoneId.getKey()), + indicatorsResultZoneId.getValue()) + "\n"); + count++; } - content.append("\n"); } + content.append("\n"); + content.append(_("coser.business.notificationmail.dataresults") + "\n"); + for (Map.Entry<String, String> noDataResultZoneId : noDataResultZoneIds.entrySet()) { + if (dataResults.containsValue(noDataResultZoneId.getValue())) { + content.append(" - " + _("coser.business.notificationmail.deleted", + getZoneFullName(noDataResultZoneId.getKey()), + noDataResultZoneId.getValue()) + "\n"); + count++; + } + + } + for (Map.Entry<String, String> dataResultZoneId : dataResultZoneIds.entrySet()) { + if (!dataResults.containsValue(dataResultZoneId.getValue())) { + content.append(" - " + _("coser.business.notificationmail.added", + getZoneFullName(dataResultZoneId.getKey()), + dataResultZoneId.getValue()) + "\n"); + count++; + } + } + content.append("\n"); + // send notification mails - int count = noMapsResultZoneIds.size() + mapsResultZoneIds.size() + - noIndicatorsResultZoneIds.size() + indicatorsResultZoneIds.size(); sendNewResultNotifications(login, count, content.toString()); // update data date @@ -892,10 +930,12 @@ * @param scanDirectory le repertoire a scanner * @param indicatorResults if true get indicator results * @param mapResults if true get map results + * @param dataResults if true get data allowed result * @return une map de resultid/nom visuel des projets * @throws CoserBusinessException */ - protected Map<String, String> getZonesIds(File scanDirectory, Boolean indicatorResults, Boolean mapResults) throws CoserBusinessException { + protected Map<String, String> getZonesIds(File scanDirectory, Boolean indicatorResults, + Boolean mapResults, Boolean dataResults) throws CoserBusinessException { Map<String, String> resultIds = new HashMap<String, String>(); File[] projectFiles = scanDirectory.listFiles(); @@ -918,8 +958,10 @@ // return result depending on result type if ( ( indicatorResults == null || rsufiResult.isIndicatorsResult() == indicatorResults ) - || - ( mapResults == null || rsufiResult.isMapsResult() == mapResults ) ) { + && + ( mapResults == null || rsufiResult.isMapsResult() == mapResults ) + && + ( dataResults == null || rsufiResult.isDataAllowed() == dataResults)) { String resultResultId = rsufiResult.getZone(); if (StringUtils.isNotBlank(resultResultId)) { String resultPath = projectFile.getName() + "/" + Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-24 11:52:37 UTC (rev 1065) @@ -114,6 +114,7 @@ coser.business.matrix.samplingeffort=Sampling effort coser.business.notificationmail.added=added \: %s (%s) coser.business.notificationmail.body=Data has been updated on website by %s.\n\n%s--\nCoser. +coser.business.notificationmail.dataresults=Data results \: coser.business.notificationmail.deleted=deleted \: %s (%s) coser.business.notificationmail.indicatorsresults=Indicator results \: coser.business.notificationmail.mapsresults=Map results \: Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-24 11:52:37 UTC (rev 1065) @@ -114,6 +114,7 @@ coser.business.matrix.samplingeffort=Effort d'échantillonnage coser.business.notificationmail.added=ajouté \: %s (%s) coser.business.notificationmail.body=Les données du site internet viennent d'être mises à jour par %s.\n\n%s--\nCoser. +coser.business.notificationmail.dataresults=Résultat de donnnées \: coser.business.notificationmail.deleted=supprimé \: %s (%s) coser.business.notificationmail.indicatorsresults=Résultats d'indicateur \: coser.business.notificationmail.mapsresults=Résultat de carte \:

1 0

r1064 - in trunk: coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay
by echatellier＠users.forge.codelutin.com Aug. 21, 2012

Aug. 21, 2012

Author: echatellier Date: 2012-08-21 12:06:08 +0200 (Tue, 21 Aug 2012) New Revision: 1064 Url: http://forge.codelutin.com/repositories/revision/coser/1064 Log: Dans l'?\195?\169tape de fusion/renommage d'esp?\195?\168ces : le commentaire n'est pas conserv?\195?\169 dans le rapport de s?\195?\169lection, ?\195?\160 corriger j'ai fait les fusions en nom scientifique et le rapport a enregistr?\195?\169 des fusions en code mn?\195?\169monique, ?\195?\160 corriger Dans l'?\195?\169tape de contr?\195?\180le des tailles, modifier le titre du warning "Longueurs aberrantes" en "Valeurs de longueurs ?\195?\160 contr?\195?\180ler" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -126,19 +126,21 @@ /** * Return human readable string for log output. * + * @param project used to convert species code * @param container rarement utile, mais dans certains cas, sert a avoir les * vrais valeur de champs au lieu des noms techniques * @return log representation */ - public abstract String getLogString(AbstractDataContainer container); + public abstract String getLogString(Project project, AbstractDataContainer container); /** * Return human readable string for ui display (used in selection replay, * and undo redo commands). * + * @param project used to convert species code * @param container rarement utile, mais dans certains cas, sert a avoir les * vrais valeur de champs au lieu des noms techniques * @return string description (i18n) */ - public abstract String getDescription(AbstractDataContainer container); + public abstract String getDescription(Project project, AbstractDataContainer container); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -182,12 +182,12 @@ } @Override - public String getLogString(AbstractDataContainer container) { + public String getLogString(Project project, AbstractDataContainer container) { return _("coser.business.command.deleteline.log", _(category.getTranslationKey()), lineNumber); } @Override - public String getDescription(AbstractDataContainer container) { + public String getDescription(Project project, AbstractDataContainer container) { String desc = _("coser.business.command.deleteline.desc", _(category.getTranslationKey()), lineNumber); if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -374,25 +374,41 @@ } @Override - public String getLogString(AbstractDataContainer container) { - String speciesAsString = StringUtils.join(speciesNames, ", "); + public String getLogString(Project project, AbstractDataContainer container) { + StringBuilder speciesAsString = new StringBuilder(256); + String separator = ""; + for (String speciesName : speciesNames) { + speciesAsString.append(separator); + speciesAsString.append(project.getDisplaySpeciesText(speciesName)); + separator = ", "; + } String log = null; if (speciesNames.length == 1) { - log = _("coser.business.command.mergespecies.rename.log", newSpecyName, speciesAsString); + log = _("coser.business.command.mergespecies.rename.log", + project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } else { - log = _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + log = _("coser.business.command.mergespecies.log", + project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } return log; } @Override - public String getDescription(AbstractDataContainer container) { - String speciesAsString = StringUtils.join(speciesNames, ", "); + public String getDescription(Project project, AbstractDataContainer container) { + StringBuilder speciesAsString = new StringBuilder(256); + String separator = ""; + for (String speciesName : speciesNames) { + speciesAsString.append(separator); + speciesAsString.append(project.getDisplaySpeciesText(speciesName)); + separator = ", "; + } String desc = null; if (speciesNames.length == 1) { - desc = _("coser.business.command.mergespecies.rename.desc", newSpecyName, speciesNames.length, speciesAsString); + desc = _("coser.business.command.mergespecies.rename.desc", + project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } else { - desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + desc = _("coser.business.command.mergespecies.desc", + project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -222,13 +222,13 @@ } @Override - public String getLogString(AbstractDataContainer container) { + public String getLogString(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); return _("coser.business.command.modifyfield.log", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); } @Override - public String getDescription(AbstractDataContainer container) { + public String getDescription(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); String desc = _("coser.business.command.modifyfield.desc", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); if (StringUtils.isNotBlank(comment)) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -631,7 +631,7 @@ for (String speciesCode : selection.getSelectedSpecies()) { speciesBuilder.append(separator); speciesBuilder.append(project.getDisplaySpeciesText(speciesCode)); - separator = ","; + separator = ", "; } // partie resumé de selection @@ -780,6 +780,7 @@ category = ((CategoryLineCommand)command).getCategory(); line = ((CategoryLineCommand)command).getLineNumber(); } + out.write("<li>"); if (category != null && line != null) { String[] data = null; switch (category) { @@ -796,12 +797,16 @@ data = strataContent.get(line); break; } - out.write("<li>" + command.getLogString(container) + "<br/>"); - out.write("<tt style='color:#5F5A59'>" + StringUtils.join(data, ", ") + "</tt><br /></li>"); + out.write(command.getLogString(project, container) + "<br/>"); + out.write("<tt style='color:#5F5A59'>" + StringUtils.join(data, ", ") + "</tt>"); + } else { + out.write(command.getLogString(project, container)); } - else { - out.write("<li>" + command.getLogString(container) + "</li>"); + // add comment if present + if (StringUtils.isNotEmpty(command.getComment())) { + out.write("<br /><i>" + command.getComment() + "</i>"); } + out.write("</li>"); } out.write("</ol>"); } Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-21 10:06:08 UTC (rev 1064) @@ -52,8 +52,8 @@ coser.business.control.error.invalidLengthLengthStep=Invalid length step (authorized centimeters and half-centimeters) coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s for species %s coser.business.control.error.invalidLengthLengthStepTip=Length field must be in centimeters. -coser.business.control.error.lengthOutliers=Aberrants lengths -coser.business.control.error.lengthOutliersDetail=Species %s \: length %4$s aberrant (average\: %2$.2f, deviation\: %3$.2f) +coser.business.control.error.lengthOutliers=Lengths values to control +coser.business.control.error.lengthOutliersDetail=Species %s \: length %4$s to control (average\: %2$.2f, deviation\: %3$.2f) coser.business.control.error.minObservationCount=Minimum number of observation not reached coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f coser.business.control.error.missingCatchHaulFromHaul=Missing haul file hauls in catch file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-21 10:06:08 UTC (rev 1064) @@ -52,8 +52,8 @@ coser.business.control.error.invalidLengthLengthStep=Le pas de longueur est invalide (autorisé centimètre et demi-centimètre) coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide pour l'espèce %s coser.business.control.error.invalidLengthLengthStepTip=Le champs de longueur doit être en centimètre (ou demi centimètre) -coser.business.control.error.lengthOutliers=Longueurs aberrantes -coser.business.control.error.lengthOutliersDetail=Espèce %s \: longueur %4$s aberrantes (moyenne\: %2$.2f, écart\: %3$.2f) +coser.business.control.error.lengthOutliers=Valeurs de longueurs à contrôler +coser.business.control.error.lengthOutliersDetail=Espèce %s \: longueur %4$s à contrôler (moyenne\: %2$.2f, écart\: %3$.2f) coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f coser.business.control.error.missingCatchHaulFromHaul=Traits du fichier traits absents dans le fichier captures Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -38,6 +38,7 @@ import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Control; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.ui.control.ControlView; @@ -108,12 +109,13 @@ if (controlView != null && controlView.getControl() != null) { Control control = controlView.getControl(); + Project project = controlView.getContextValue(Project.class); menuEnabled = !redoableCommands.isEmpty(); // command in reverse order (only 10 last) for (int i = redoableCommands.size() - 1 ; i >= 0 && i > redoableCommands.size() - 10 ; i--) { Command command = redoableCommands.get(i); - JMenuItem commandMenu = new JMenuItem(command.getDescription(control)); + JMenuItem commandMenu = new JMenuItem(command.getDescription(project, control)); commandMenu.setActionCommand(String.valueOf(i)); commandMenu.addActionListener(this); add(commandMenu); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -38,6 +38,7 @@ import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Control; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.ui.control.ControlView; @@ -98,13 +99,14 @@ if (controlView != null && controlView.getControl() != null) { Control control = controlView.getControl(); + Project project = controlView.getContextValue(Project.class); List<Command> commands = controlView.getControl().getHistoryCommands(); menuEnabled = !commands.isEmpty(); // command in reverse order (only 10 last) for (int i = commands.size() - 1 ; i >= 0 && i > commands.size() - 10 ; i--) { Command command = commands.get(i); - JMenuItem commandMenu = new JMenuItem(command.getDescription(control)); + JMenuItem commandMenu = new JMenuItem(command.getDescription(project, control)); commandMenu.setActionCommand(String.valueOf(i)); commandMenu.addActionListener(this); add(commandMenu); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -28,6 +28,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; /** @@ -44,6 +45,12 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6780656602646606040L; + protected Project project; + + public CommandListRenderer(Project project) { + this.project = project; + } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -52,7 +59,7 @@ // can be null here. Renderer is currently used only un selection // replay where merge command don't use container to get desc - String commandDesc = command.getDescription(null); + String commandDesc = command.getDescription(project, null); // is selected is forced to "true", because user can't disable // command in replay selection as of coser version 1.2.x Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -74,10 +74,14 @@ */ public void initReplayView(SelectionReplayView view) { ProjectService projectService = view.getContextValue(ProjectService.class); + Project project = view.getContextValue(Project.class); SortedMap<String, List<String>> selectionsByProject = projectService.getSelectionByProject(); SelectionByProjectTreeModel treeModel = new SelectionByProjectTreeModel(selectionsByProject); view.getSelectionByProjectTree().setModel(treeModel); + + // set list renderer with project to replace species code + view.getCommandList().setCellRenderer(new CommandListRenderer(project)); } /** @@ -268,7 +272,7 @@ for (String species : remaindSpecies) { speciesBuilder.append(separator); speciesBuilder.append(project.getDisplaySpeciesText(species)); - separator = ","; + separator = ", "; } String message = _("coser.ui.selection.replay.missingspecies", speciesBuilder.toString()); view.getMessageArea5().setText(message); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-08-21 10:06:08 UTC (rev 1064) @@ -183,8 +183,7 @@ <cell weightx="1" weighty="1" fill="both" columns="3"> <JScrollPane> <fr.ifremer.coser.ui.selection.replay.CommandListModel id="commandListModel" /> - <JList id="commandList" model="{commandListModel}" - cellRenderer="{new fr.ifremer.coser.ui.selection.replay.CommandListRenderer()}"/> + <JList id="commandList" model="{commandListModel}" /> </JScrollPane> </cell> </row>

1 0

r1063 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:57:24 +0200 (Mon, 20 Aug 2012) New Revision: 1063 Url: http://forge.codelutin.com/repositories/revision/coser/1063 Log: Fix test Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2012-08-20 16:57:05 UTC (rev 1062) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2012-08-20 16:57:24 UTC (rev 1063) @@ -136,9 +136,6 @@ Assert.assertTrue(fileContent.indexOf(_("coser.business.control.error.allCategories")) > 0); // clean all - File imagesDir = new File(htmlExport.getParentFile(), "images"); - Assert.assertTrue(imagesDir.isDirectory()); - FileUtils.deleteDirectory(imagesDir); htmlExport.delete(); }

1 0

r1062 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:57:05 +0200 (Mon, 20 Aug 2012) New Revision: 1062 Url: http://forge.codelutin.com/repositories/revision/coser/1062 Log: D?\195?\169placement dans la barre d'outils Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:38:27 UTC (rev 1061) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:57:05 UTC (rev 1062) @@ -80,7 +80,8 @@ </cell> </row> <row> - <cell columns="2"> + <cell /> + <cell /> <cell fill="horizontal" insets="0" columns="2"> <Table> <row> @@ -117,7 +118,10 @@ </row> </Table> </cell> - <cell columns="4"> + <cell /> + <cell /> + <cell /> + <cell /> </row> <row> <cell weighty="1" weightx="1" fill="both" columns="2">

1 0

r1061 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:38:27 +0200 (Mon, 20 Aug 2012) New Revision: 1061 Url: http://forge.codelutin.com/repositories/revision/coser/1061 Log: Dans les rapports pdf : le controle.pdf est en fait le modification.pdf. Il manque actuellement le controle.pdf avec les warning etc. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -88,6 +88,7 @@ import fr.ifremer.coser.command.DeleteLineCommand; import fr.ifremer.coser.command.MergeSpeciesCommand; import fr.ifremer.coser.command.ModifyFieldCommand; +import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -844,10 +845,11 @@ * Genère également les PDF des rapports de contrôle. * * @param project project to save + * @param validationErrors controls errors used to fill pdf * @throws CoserBusinessException * @since 1.3 */ - public void validControl(Project project) throws CoserBusinessException { + public void validControl(Project project, List<ControlError> validationErrors) throws CoserBusinessException { Control control = project.getControl(); control.setValidated(true); @@ -860,7 +862,7 @@ File projectDirectory = new File(projectsDirectory, project.getName()); File controlDirectory = new File(projectDirectory, CoserConstants.STORAGE_CONTROL_DIRECTORY); File controlReportPdf = new File(controlDirectory, "control.pdf"); - publicationService.extractControlLogAsPDF(project, control, controlReportPdf); + publicationService.extractControlLogAsPDF(project, control, validationErrors, controlReportPdf); } /** Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -52,6 +52,7 @@ import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -73,6 +74,7 @@ import org.jfree.data.category.DefaultCategoryDataset; import org.jfree.data.statistics.DefaultStatisticalCategoryDataset; import org.jfree.util.ShapeUtilities; +import org.nuiton.util.FileUtil; import org.w3c.dom.Document; import org.xhtmlrenderer.pdf.ITextRenderer; @@ -260,15 +262,6 @@ protected JFreeChart displayGraph(CategoryDataset categoryDataSet, String title) { - // create a chart with the dataset - //DefaultCategoryDataset dataset = new DefaultCategoryDataset(); - - /*for (Map.Entry<String, SortedMap<String, Double>> resultSerie : resultSeries.entrySet()) { - for (Map.Entry<String, Double> data : resultSerie.getValue().entrySet()) { - dataset.setValue(data.getValue(), resultSerie.getKey(), data.getKey()); - } - }*/ - CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); categoryAxis.setCategoryMargin(0); // label horizontaux @@ -282,11 +275,6 @@ Shape firstShape = ShapeUtilities.createDiamond(5F); renderer.setSeriesShape(0, firstShape); - // n'affiche pas les nombre sur le graphique - //StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); - //renderer.setBaseItemLabelGenerator(itemLabelGenerator); - //renderer.setBaseItemLabelsVisible(true); - CategoryToolTipGenerator cttg = new StandardCategoryToolTipGenerator("{0}: {2}", NumberFormat.getInstance()); renderer.setBaseToolTipGenerator(cttg); @@ -311,135 +299,171 @@ * @return export html file * @throws CoserBusinessException */ - public File exportErrorsAsHTML(Project project, AbstractDataContainer container, List<ControlError> validationErrors) throws CoserBusinessException { + public File exportErrorsAsHTML(Project project, AbstractDataContainer container, + List<ControlError> validationErrors) throws CoserBusinessException { File exportHtmlFile = null; - PrintStream out = null; + Writer out = null; try { exportHtmlFile = File.createTempFile("errors-", ".html"); + exportHtmlFile.deleteOnExit(); if (log.isInfoEnabled()) { log.info("Generating HTML report to " + exportHtmlFile.getAbsolutePath()); } - List<String> speciesGraph = new ArrayList<String>(); - File imageDirectory = new File(exportHtmlFile.getParentFile(), "images"); - imageDirectory.mkdirs(); - out = new PrintStream(exportHtmlFile, "utf-8"); - out.println("<html><head>"); - out.println("<title>" + _("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); - out.println("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"); - out.println("</head><body>"); + out = new OutputStreamWriter(new FileOutputStream(exportHtmlFile), "utf-8"); - // convert all errors as tree (code duplicated from ui tree model) - Map<String, List<ControlErrorGroup>> validationCategoryChild = new HashMap<String, List<ControlErrorGroup>>(); - Map<ControlErrorGroup, List<ControlError>> validationErrorsChilds = new HashMap<ControlErrorGroup, List<ControlError>>(); - for (ControlError validationError : validationErrors) { + exportErrorsAsHTML(project, container, validationErrors, out, false); + } catch (IOException ex) { + throw new CoserBusinessException("Can't export errors", ex); + } finally { + IOUtils.closeQuietly(out); + } + return exportHtmlFile; + } + + /** + * Export la liste d'erreurs dans un fichier html avec la liste des graphes + * si necessaire. + * + * Genere les graphes en fin de fichier avec des liens html pour voir les + * graphes depuis les erreurs. + * + * @param project project + * @param container data container + * @param validationErrors errors list + * @param includeProjectInfo add project info to generate persistant pdf + * @return export html file + * @throws CoserBusinessException + * @throws IOException + */ + protected void exportErrorsAsHTML(Project project, AbstractDataContainer container, + List<ControlError> validationErrors, Writer out, boolean includeProjectInfo) throws CoserBusinessException, IOException { - String category = validationError.getCategory() == null ? _("coser.business.control.error.allCategories") : _(validationError.getCategory().getTranslationKey()); - List<ControlErrorGroup> errorGroup = validationCategoryChild.get(category); - if (errorGroup == null) { - errorGroup = new ArrayList<ControlErrorGroup>(); - validationCategoryChild.put(category, errorGroup); - } - ControlErrorGroup group = new ControlErrorGroup(validationError.getCategory(), validationError.getLevel(), validationError.getMessage()); - List<ControlError> childErrors = validationErrorsChilds.get(group); - if (childErrors == null) { - childErrors = new ArrayList<ControlError>(); - validationErrorsChilds.put(group, childErrors); - errorGroup.add(group); - } + List<String> speciesGraph = new ArrayList<String>(); + File imageDirectory = FileUtil.createTempDirectory("images", "pdf"); + imageDirectory.mkdirs(); + imageDirectory.deleteOnExit(); - if (validationError instanceof SpeciesControlError) { - SpeciesControlError diffError = (SpeciesControlError)validationError; - speciesGraph.add(diffError.getSpecies()); - } - childErrors.add(validationError); + out.write("<html><head>"); + out.write("<title>" + _("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); + out.write("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); + out.write("</head><body>"); + + // convert all errors as tree (code duplicated from ui tree model) + Map<String, List<ControlErrorGroup>> validationCategoryChild = new HashMap<String, List<ControlErrorGroup>>(); + Map<ControlErrorGroup, List<ControlError>> validationErrorsChilds = new HashMap<ControlErrorGroup, List<ControlError>>(); + for (ControlError validationError : validationErrors) { + + String category = validationError.getCategory() == null ? _("coser.business.control.error.allCategories") : _(validationError.getCategory().getTranslationKey()); + List<ControlErrorGroup> errorGroup = validationCategoryChild.get(category); + if (errorGroup == null) { + errorGroup = new ArrayList<ControlErrorGroup>(); + validationCategoryChild.put(category, errorGroup); } - - Map<String, JFreeChart> charts = getCompareCatchLengthGraph(project, container, speciesGraph); + ControlErrorGroup group = new ControlErrorGroup(validationError.getCategory(), validationError.getLevel(), validationError.getMessage()); + List<ControlError> childErrors = validationErrorsChilds.get(group); + if (childErrors == null) { + childErrors = new ArrayList<ControlError>(); + validationErrorsChilds.put(group, childErrors); + errorGroup.add(group); + } - // render output html - out.println("<h1 style='text-align:center'>" + _("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); - for (Map.Entry<String, List<ControlErrorGroup>> categoriesEntry : validationCategoryChild.entrySet()) { - out.println("<h2>" + categoriesEntry.getKey() + "</h2>"); + if (validationError instanceof SpeciesControlError) { + SpeciesControlError diffError = (SpeciesControlError)validationError; + speciesGraph.add(diffError.getSpecies()); + } + childErrors.add(validationError); + } + + Map<String, JFreeChart> charts = getCompareCatchLengthGraph(project, container, speciesGraph); - out.println("<ul>"); - for (ControlErrorGroup group : categoriesEntry.getValue()) { + // render output html + out.write("<h1 style='text-align:center'>" + _("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); - out.println("<li style='margin-bottom:20px'><span style='color:"); - switch (group.getValidationLevel()) { - case FATAL: - out.print("rgb(88,0,0)"); - break; - case ERROR: - out.print("red"); - break; - case WARNING: - out.print("orange"); - break; - case INFO: - out.print("green"); - break; - } - out.print(";font-weight:bold'>" + _(group.getMessage())); - out.println("</span>"); + if (includeProjectInfo) { + // partie detail + extractProjectReport(project, out); + // partie specific : commandes + extractHistoryCommandReport(project, container, out); + } - out.println("<ul>"); - for (ControlError error : validationErrorsChilds.get(group)) { - out.println("<li type='circle'>"); - out.print(_(error.getDetailMessage())); - List<String> lineNumbers = error.getLineNumbers(); - if (CollectionUtils.isNotEmpty(lineNumbers)) { - out.print(" (" + _("coser.business.publication.errorexportlines") + " : "); - Iterator<String> itLineNumbers = lineNumbers.iterator(); - while (itLineNumbers.hasNext()) { - out.print(itLineNumbers.next()); - if (itLineNumbers.hasNext()) { - out.print(", "); - } + for (Map.Entry<String, List<ControlErrorGroup>> categoriesEntry : validationCategoryChild.entrySet()) { + out.write("<h2>" + categoriesEntry.getKey() + "</h2>"); + + out.write("<ul>"); + for (ControlErrorGroup group : categoriesEntry.getValue()) { + + out.write("<li style='margin-bottom:20px'><span style='color:"); + switch (group.getValidationLevel()) { + case FATAL: + out.write("rgb(88,0,0)"); + break; + case ERROR: + out.write("red"); + break; + case WARNING: + out.write("orange"); + break; + case INFO: + out.write("green"); + break; + } + out.write(";font-weight:bold'>" + _(group.getMessage())); + out.write("</span>"); + + out.write("<ul>"); + for (ControlError error : validationErrorsChilds.get(group)) { + out.write("<li type='circle'>"); + out.write(_(error.getDetailMessage())); + List<String> lineNumbers = error.getLineNumbers(); + if (CollectionUtils.isNotEmpty(lineNumbers)) { + out.write(" (" + _("coser.business.publication.errorexportlines") + " : "); + Iterator<String> itLineNumbers = lineNumbers.iterator(); + while (itLineNumbers.hasNext()) { + out.write(itLineNumbers.next()); + if (itLineNumbers.hasNext()) { + out.write(", "); } - out.println(")"); } - - // ajout d'un graph si necessaire - if (error instanceof DiffCatchLengthControlError) { - DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; - String species = diffError.getSpecies(); - out.println(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); - } + out.write(")"); + } + + // ajout d'un graph si necessaire + if (error instanceof DiffCatchLengthControlError) { + DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; + String species = diffError.getSpecies(); + out.write(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); + } - String tipMessage = _(error.getTipMessage()); - if (StringUtils.isNotEmpty(error.getTipMessage())) { - out.println("<p style='font-style:italic'>" + tipMessage + "</p>"); - } - - out.println("</li>"); + String tipMessage = _(error.getTipMessage()); + if (StringUtils.isNotEmpty(error.getTipMessage())) { + out.write("<p style='font-style:italic'>" + tipMessage + "</p>"); } - out.println("</ul>"); - out.println("</li>"); + + out.write("</li>"); } - out.println("</ul>"); + out.write("</ul>"); + out.write("</li>"); } + out.write("</ul>"); + } - out.println("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); - out.println("<ul>"); - // generation des graphiques - for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { - JFreeChart chart = chartEntry.getValue(); - File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); - ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); - out.println("<li><p><a name='graph" + chartEntry.getKey() + "'>" + chartEntry.getKey() + "</a></p>"); - out.println("<img src='images/" + tmpChartImage.getName() + "' /></li>"); - } - out.println("</ul>"); + out.write("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); + out.write("<ul>"); + // generation des graphiques + for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { + JFreeChart chart = chartEntry.getValue(); + File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); + tmpChartImage.deleteOnExit(); + ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 600, 300); + out.write("<li><p><a name='graph" + chartEntry.getKey() + "'>"); + out.write(project.getDisplaySpeciesText(chartEntry.getKey()) + "</a></p>"); + out.write("<img src='" + imageDirectory.getName() + "/" + tmpChartImage.getName() + "' /></li>"); + } + out.write("</ul>"); - out.println("</body></html>"); - } catch (IOException ex) { - throw new CoserBusinessException("Can't export errors", ex); - } finally { - IOUtils.closeQuietly(out); - } - return exportHtmlFile; + out.write("</body></html>"); } /** @@ -504,6 +528,7 @@ * * @param project project * @param control data container + * @param validationErrors * @param pdfFile output pdf file * @return extractedFile * @throws CoserBusinessException @@ -511,13 +536,14 @@ * * @see AbstractDataContainer#getHistoryCommands() */ - public void extractControlLogAsPDF(Project project, Control control, File pdfFile) throws CoserBusinessException { + public void extractControlLogAsPDF(Project project, Control control, + List<ControlError> validationErrors, File pdfFile) throws CoserBusinessException { OutputStream os = null; try { Writer out = new StringWriter(); - extractControlLogAsHTML(project, control, out); + exportErrorsAsHTML(project, control, validationErrors, out, true); out.flush(); // get content as w3c document @@ -527,7 +553,9 @@ os = new FileOutputStream(pdfFile); ITextRenderer renderer = new ITextRenderer(); - renderer.setDocument(document, null); + // TODO la base de generation est fixé en dur a java.io.tmpdir + // car je sais que exportErrorsAsHTML genere les images dedans + renderer.setDocument(document, "file://" + System.getProperty("java.io.tmpdir") + "/"); renderer.layout(); renderer.createPDF(os); @@ -556,6 +584,7 @@ Writer out = null; try { exportHtmlFile = File.createTempFile("log-", ".html"); + exportHtmlFile.deleteOnExit(); if (log.isInfoEnabled()) { log.info("Generating HTML report to " + exportHtmlFile.getAbsolutePath()); } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-08-20 16:37:59 UTC (rev 1060) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-08-20 16:38:27 UTC (rev 1061) @@ -162,7 +162,7 @@ @Test public void testValidControl() throws CoserBusinessException { Project project = createTestProject(projectService, false); - projectService.validControl(project); + projectService.validControl(project, Collections.EMPTY_LIST); Assert.assertTrue(project.getControl().isValidated()); Assert.assertTrue(getFile(config.getProjectsDirectory(),

1 0

r1060 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:59 +0200 (Mon, 20 Aug 2012) New Revision: 1060 Url: http://forge.codelutin.com/repositories/revision/coser/1060 Log: D?\195?\169placement dans la barre d'outils Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:37:37 UTC (rev 1059) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:37:59 UTC (rev 1060) @@ -55,6 +55,10 @@ <row> <cell columns="8" weightx="1" insets="0" fill="horizontal"> <JToolBar floatable="false"> + <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchLength" + onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)" /> + <JButton icon="chart_bar.png" text="coser.ui.graph.lengthStructure" + onActionPerformed="getHandler().displayLengthStructureGraph(this)" /> <Component initializer="javax.swing.Box.createHorizontalGlue()" /> <JButton id="validSelectionButton" text="coser.ui.selection.details.validSelection" icon="accept.png" onActionPerformed="getHandler().validSelection(this)" /> @@ -76,8 +80,7 @@ </cell> </row> <row> - <cell /> - <cell /> + <cell columns="2"> <cell fill="horizontal" insets="0" columns="2"> <Table> <row> @@ -114,16 +117,7 @@ </row> </Table> </cell> - <cell fill="horizontal" insets="0" columns="2"> - <JPanel> - <JButton icon="chart_curve.png" toolTipText="coser.ui.graph.compareNumberCatchLength" - onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)" /> - <JButton icon="chart_bar.png" toolTipText="coser.ui.graph.lengthStructure" - onActionPerformed="getHandler().displayLengthStructureGraph(this)" /> - </JPanel> - </cell> - <cell /> - <cell /> + <cell columns="4"> </row> <row> <cell weighty="1" weightx="1" fill="both" columns="2">

1 0

r1059 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:37 +0200 (Mon, 20 Aug 2012) New Revision: 1059 Url: http://forge.codelutin.com/repositories/revision/coser/1059 Log: Un double clic sur le warning taille aberrante dans la phase de contr?\195?\180le doit afficher le graph de la structure en taille de l'esp?\195?\168ce Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 16:37:16 UTC (rev 1058) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 16:37:37 UTC (rev 1059) @@ -1185,7 +1185,7 @@ Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); SwingSession session = view.getContextValue(SwingSession.class); - displayLengthStructureGraph(view, session, projectService, project, selection); + displayLengthStructureGraph(view, session, projectService, project, selection, null); } /**

1 0

r1058 - in trunk: coser-business/src/main/java/fr/ifremer/coser/control coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/common coser-ui/src/main/java/fr/ifremer/coser/ui/control
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:37:16 +0200 (Mon, 20 Aug 2012) New Revision: 1058 Url: http://forge.codelutin.com/repositories/revision/coser/1058 Log: Un double clic sur le warning taille aberrante dans la phase de contr?\195?\180le doit afficher le graph de la structure en taille de l'esp?\195?\168ce Added: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java Added: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -0,0 +1,44 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.control; + +/** + * Erreur de controls specifique aux taille des espèces devant par exemple + * afficher un type de graphique particulier dans l'UI. + * + * @author chatellier + * @version $Revision$ + * @since 1.3 + * + * Last update : $Date$ + * By : $Author$ + */ +public class SpeciesLengthControlError extends SpeciesControlError { + + /** serialVersionUID */ + private static final long serialVersionUID = 6646855823928956144L; + +} Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/control/SpeciesLengthControlError.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -67,6 +67,7 @@ import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.DiffCatchLengthControlError; import fr.ifremer.coser.control.SpeciesControlError; +import fr.ifremer.coser.control.SpeciesLengthControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -970,10 +971,11 @@ if (Math.abs(nombre - avg) > deviation * config.getStandardDeviationToAverage()) { String lineNumber = tuple[AbstractDataEntity.INDEX_LINE]; - ControlError error = new ControlError(); + SpeciesLengthControlError error = new SpeciesLengthControlError(); error.setCategory(Category.LENGTH); error.setLevel(ValidationLevel.WARNING); error.addLineNumber(lineNumber); + error.setSpecies(species); error.setMessage(_("coser.business.control.error.lengthOutliers", avg, deviation)); error.setDetailMessage(_("coser.business.control.error.lengthOutliersDetail", project.getDisplaySpeciesText(species), avg, deviation, lengthValue)); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -63,9 +63,11 @@ * @param projectService projectService * @param project project * @param container data container + * @param species selected species (can be null) */ public void displayLengthStructureGraph(final Component parent, final SwingSession session, - final ProjectService projectService, final Project project, final AbstractDataContainer container) { + final ProjectService projectService, final Project project, final AbstractDataContainer container, + final String species) { SwingUtilities.invokeLater(new Runnable() { public void run() { try { @@ -89,9 +91,17 @@ panel.addMatrixFilter(new LengthStructureMatrixFilter(project, container)); panel.setMatrix(matrix); // init default selection and rendering + String defaultSpecies = species; + if (defaultSpecies != null) { + // il faut quand même la traduire car les données + // contiennent les noms déjà traduits + defaultSpecies = project.getDisplaySpeciesText(defaultSpecies); + } else { + defaultSpecies = (String)matrix.getSemantic(1).get(0); + } panel.initRenderering(new List[]{ matrix.getSemantic(0), // select all length - Collections.singletonList(matrix.getSemantic(1).get(0)) // select first species + Collections.singletonList(defaultSpecies) // select first species }, new int[]{-1, -1, 0, 0}); // select dim 3 et 4 sum action matrixViewerFrame.add(panel); matrixViewerFrame.pack(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2012-08-20 16:36:35 UTC (rev 1057) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2012-08-20 16:37:16 UTC (rev 1058) @@ -87,6 +87,7 @@ import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.ControlErrorGroup; import fr.ifremer.coser.control.SpeciesControlError; +import fr.ifremer.coser.control.SpeciesLengthControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -642,7 +643,11 @@ if (userObject instanceof SpeciesControlError) { SpeciesControlError error = (SpeciesControlError)userObject; String species = error.getSpecies(); - displayCompareNumberCatchGraph(controlView, species); + if (userObject instanceof SpeciesLengthControlError) { + displayLengthStructureGraph(controlView, species); + } else { + displayCompareNumberCatchGraph(controlView, species); + } } } } @@ -1023,10 +1028,20 @@ * @param view view */ public void displayLengthStructureGraph(ControlView view) { + displayLengthStructureGraph(view, null); + } + + /** + * Display lengthStructure matrix in matrixviewerpanel. + * + * @param view view + * @param species selected species (can be null) + */ + public void displayLengthStructureGraph(ControlView view, String species) { Project project = view.getContextValue(Project.class); ProjectService projectService = view.getContextValue(ProjectService.class); SwingSession session = view.getContextValue(SwingSession.class); - displayLengthStructureGraph(view, session, projectService, project, project.getControl()); + displayLengthStructureGraph(view, session, projectService, project, project.getControl(), species); } /** @@ -1156,7 +1171,8 @@ ProjectService service = view.getContextValue(ProjectService.class); try { - service.validControl(project); + List<ControlError> controlErrors = view.getGlobalControlErrorModel().getControlErrors(); + service.validControl(project, controlErrors); JOptionPane.showMessageDialog(view, _("coser.ui.control.controlValidated"), _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) {

1 0

r1057 - in trunk/coser-business/src/main: java/fr/ifremer/coser/command resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 18:36:35 +0200 (Mon, 20 Aug 2012) New Revision: 1057 Url: http://forge.codelutin.com/repositories/revision/coser/1057 Log: Quand je renomme j'ai "Les esp?\195?\168ces "ALLOSUB" ont ?\195?\169t?\195?\169 fusionn?\195?\169es en "ALLOMED"" il faudrait avoir "L'esp?\195?\168ce "ALLOSUB" a ?\195?\169t?\195?\169 renomm?\195?\169e en "ALLOMED" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 16:36:35 UTC (rev 1057) @@ -376,13 +376,24 @@ @Override public String getLogString(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - return _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + String log = null; + if (speciesNames.length == 1) { + log = _("coser.business.command.mergespecies.rename.log", newSpecyName, speciesAsString); + } else { + log = _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + } + return log; } @Override public String getDescription(AbstractDataContainer container) { String speciesAsString = StringUtils.join(speciesNames, ", "); - String desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + String desc = null; + if (speciesNames.length == 1) { + desc = _("coser.business.command.mergespecies.rename.desc", newSpecyName, speciesNames.length, speciesAsString); + } else { + desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + } if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=In file %s, line %s has been deleted coser.business.command.mergespecies.desc=Merge %2$s species into "%1$s" \: %3$s coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s" +coser.business.command.mergespecies.rename.desc=Species "%3$s" has been renamed to "%1$s" +coser.business.command.mergespecies.rename.log=Species "%2$s" has been renamed to "%1$s" coser.business.command.modifyfield.desc=File %1$s, %3$s field modification (line %2$s) coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s" coser.business.common.length=Length Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 10:09:05 UTC (rev 1056) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 16:36:35 UTC (rev 1057) @@ -32,6 +32,8 @@ coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a été supprimée coser.business.command.mergespecies.desc=%2$s espèces ont été fusionnées en "%1$s" \: %3$s coser.business.command.mergespecies.log=Les espèces "%2$s" ont été fusionnées en "%1$s" +coser.business.command.mergespecies.rename.desc=L'espèce "%3$s" a été renommée en "%1$s" +coser.business.command.mergespecies.rename.log=L'espèce "%2$s" a été renommée en "%1$s" coser.business.command.modifyfield.desc=Fichier %1$s, modification du champ "%3$s" (ligne %2$s) coser.business.command.modifyfield.log=Dans le ficher %s à la ligne %s, le champs "%s" est passé de la valeur "%s" à "%s" coser.business.common.length=Taille @@ -133,7 +135,7 @@ coser.business.publication.selectionchoices=Choix de sélections coser.business.publication.selectionlogexporttitle=Rapport de la sélection %s (projet %s) coser.business.publication.stratafilename=Nom du fichier strates -coser.business.result.rsufiResultAlreadyExists=Le résultat %D existe déjà \! +coser.business.result.rsufiResultAlreadyExists=Le résultat %s existe déjà \! coser.business.resultupload.duplicatedresult=Le résultat %s/%s/%s duplique un autre résultat pour la zone %s \! coser.business.selection.notValidatedControl=Contrôle non validé \! coser.business.uploadresult.checkcollision=Vérification des collisions de zones

1 0

r1056 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize
by echatellier＠users.forge.codelutin.com Aug. 20, 2012

Aug. 20, 2012

Author: echatellier Date: 2012-08-20 12:09:05 +0200 (Mon, 20 Aug 2012) New Revision: 1056 Url: http://forge.codelutin.com/repositories/revision/coser/1056 Log: Correction de la mise ?\195?\160 jour de la frise Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.ui.CoserFrame; @@ -86,11 +87,31 @@ } if (FreizeModel.PROPERTY_PROJECT.equals(propertyName)) { + Project oldProject = (Project)evt.getOldValue(); + if (oldProject != null) { + oldProject.getControl().removePropertyChangeListener(this); + } + Project newProject = (Project)evt.getNewValue(); + if (newProject != null) { + newProject.getControl().addPropertyChangeListener(this); + } updateUi(); } else if (FreizeModel.PROPERTY_SELECTION.equals(propertyName)) { + Selection oldSelection = (Selection)evt.getOldValue(); + if (oldSelection != null) { + oldSelection.removePropertyChangeListener(this); + } + Selection newSelection = (Selection)evt.getNewValue(); + if (newSelection != null) { + newSelection.addPropertyChangeListener(this); + } updateUi(); - } else if (FreizeModel.PROPERTY_R_SUFI_RESULT.equals(propertyName)) { + } else if (Selection.PROPERTY_RSUFI_RESULTS.equals(propertyName)) { updateUi(); + } else if (Control.PROPERTY_VALIDATED.equals(propertyName) || + Selection.PROPERTY_VALIDATED.equals(propertyName)) { + // c'est les même propriétés, mais ca ne pose pas de pbs + updateUi(); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 09:41:28 UTC (rev 1055) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-20 10:09:05 UTC (rev 1056) @@ -35,7 +35,6 @@ public static final String PROPERTY_PROJECT = "project"; public static final String PROPERTY_SELECTION = "selection"; - public static final String PROPERTY_R_SUFI_RESULT = "rSufiResult"; public static final String PROPERTY_STEP0_ENABLED = "step0Enabled"; public static final String PROPERTY_STEP1_ENABLED = "step1Enabled"; public static final String PROPERTY_STEP2_ENABLED = "step2Enabled"; @@ -75,16 +74,6 @@ this.selection = selection; pcs.firePropertyChange(PROPERTY_SELECTION, oldValue, selection); } - - public RSufiResult getrSufiResult() { - return rSufiResult; - } - - public void setrSufiResult(RSufiResult rSufiResult) { - RSufiResult oldValue = this.rSufiResult; - this.rSufiResult = rSufiResult; - pcs.firePropertyChange(PROPERTY_R_SUFI_RESULT, oldValue, rSufiResult); - } public boolean isStep0Enabled() { return step0Enabled;

1 0