Author: kmorin Date: 2013-06-10 11:50:08 +0200 (Mon, 10 Jun 2013) New Revision: 1089 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1089 Log: fixes #2632 [IMP/EXP] - Import/Export multi-postes : message avertissant que certaines donn?\195?\169es ne sont pas import?\195?\169es (alors que tout est import?\195?\169) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -92,31 +92,34 @@ Collection<BenthosBatch> notImportedBenthosBatches = (Collection<BenthosBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (BenthosBatch sb : notImportedBenthosBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editBenthosBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,20 +91,23 @@ Collection<MarineLitterBatch> notImportedMarineLitterBatches = (Collection<MarineLitterBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); if (totalWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); } for (MarineLitterBatch mlb : notImportedMarineLitterBatches) { - batchList.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); + stringBuffer.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editMarineLitterBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,31 +91,34 @@ Collection<SpeciesBatch> notImportedSpeciesBatches = (Collection<SpeciesBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (SpeciesBatch sb : notImportedSpeciesBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editSpeciesBatch.action.importMultiPost.success", file));