branch develop updated (edc5cb0 -> 1618131)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from edc5cb0 use less memory for report new b0f2bad refs 6809 la mise en modification des onglets n'est pas ok new 1618131 fixes #6817: [TECHN] Ne pas bloquer l'application à l'ouverture même si certains fichiers temporaires ne peuvent être détruit The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1618131aeb6a1f5a9c6db0af1442fd0d7797c8c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 13 12:31:37 2015 +0100 fixes #6817: [TECHN] Ne pas bloquer l'application à l'ouverture même si certains fichiers temporaires ne peuvent être détruit commit b0f2bad9a636c6bb0ed1d3118506fd7166e09813 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 13 11:53:18 2015 +0100 refs 6809 la mise en modification des onglets n'est pas ok Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 27 ++++++++++++++++------ .../catches/AbstractTuttiBatchUIModel.java | 5 ---- .../operation/catches/EditCatchesUIHandler.java | 3 +-- .../operation/catches/EditCatchesUIModel.java | 2 -- .../accidental/AccidentalBatchUIHandler.java | 1 - .../catches/accidental/AccidentalBatchUIModel.java | 3 +-- .../catches/benthos/BenthosBatchUIHandler.java | 1 - .../catches/benthos/BenthosBatchUIModel.java | 3 +-- .../IndividualObservationBatchUIHandler.java | 1 - .../IndividualObservationBatchUIModel.java | 3 +-- .../marinelitter/MarineLitterBatchUIHandler.java | 1 - .../marinelitter/MarineLitterBatchUIModel.java | 3 +-- .../catches/species/SpeciesBatchUIHandler.java | 1 - .../catches/species/SpeciesBatchUIModel.java | 3 +-- 14 files changed, 26 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b0f2bad9a636c6bb0ed1d3118506fd7166e09813 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 13 11:53:18 2015 +0100 refs 6809 la mise en modification des onglets n'est pas ok --- .../swing/content/operation/catches/AbstractTuttiBatchUIModel.java | 5 ----- .../ui/swing/content/operation/catches/EditCatchesUIHandler.java | 3 +-- .../tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java | 2 -- .../operation/catches/accidental/AccidentalBatchUIHandler.java | 1 - .../content/operation/catches/accidental/AccidentalBatchUIModel.java | 3 +-- .../content/operation/catches/benthos/BenthosBatchUIHandler.java | 1 - .../swing/content/operation/catches/benthos/BenthosBatchUIModel.java | 3 +-- .../individualobservation/IndividualObservationBatchUIHandler.java | 1 - .../individualobservation/IndividualObservationBatchUIModel.java | 3 +-- .../operation/catches/marinelitter/MarineLitterBatchUIHandler.java | 1 - .../operation/catches/marinelitter/MarineLitterBatchUIModel.java | 3 +-- .../content/operation/catches/species/SpeciesBatchUIHandler.java | 1 - .../swing/content/operation/catches/species/SpeciesBatchUIModel.java | 3 +-- 13 files changed, 6 insertions(+), 24 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java index 5097395..09c27a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java @@ -102,9 +102,4 @@ public abstract class AbstractTuttiBatchUIModel<R extends AbstractTuttiBeanUIMod return null; } - public void fireBatchUpdated(R row) { - if (catchesUIModel != null) { - catchesUIModel.firePropertyChanged(EditCatchesUIModel.PROPERTY_BATCH_UPDATED, null, row); - } - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index c016991..a675d4d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -277,8 +277,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi EditCatchesUIModel.PROPERTY_SPECIES_DISTINCT_SORTED_SPECIES_COUNT, EditCatchesUIModel.PROPERTY_BENTHOS_DISTINCT_SORTED_SPECIES_COUNT, EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_ATTACHMENT, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED + EditCatchesUIModel.PROPERTY_ATTACHMENT )); return result; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java index 3d6737a..ccf189c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java @@ -60,8 +60,6 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi public static final String PROPERTY_CATCH_BATCH = "catchBatch"; - public static final String PROPERTY_BATCH_UPDATED = "batchUpdated"; - protected static final Binder<CatchBatch, EditCatchesUIModel> fromBeanBinder = BinderFactory.newBinder(CatchBatch.class, EditCatchesUIModel.class); protected static final Binder<EditCatchesUIModel, CatchBatch> toBeanBinder = BinderFactory.newBinder(EditCatchesUIModel.class, CatchBatch.class); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index 016ce07..c8e8d60 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -442,6 +442,5 @@ public class AccidentalBatchUIHandler getPersistenceService().saveAccidentalBatch(entityToSave); } - getModel().fireBatchUpdated(row); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java index 979b1c6..04c0e07 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java @@ -44,8 +44,7 @@ public class AccidentalBatchUIModel extends AbstractTuttiBatchUIModel<Accidental protected boolean removeBatchEnabled; public AccidentalBatchUIModel(EditCatchesUIModel catchesUIModel) { - super(catchesUIModel, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED); + super(catchesUIModel); } public boolean isRemoveBatchEnabled() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index b2c2dec..17f65a8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -1273,7 +1273,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent frequencyRows = BenthosFrequencyRowModel.fromEntity(weightUnit, frequency); row.setFrequency(frequencyRows); - getModel().fireBatchUpdated(row); } /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java index 9c4416d..355f7b0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java @@ -163,8 +163,7 @@ public class BenthosBatchUIModel extends AbstractTuttiBatchUIModel<BenthosBatchR EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED); + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index d6398a2..330eec6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -754,6 +754,5 @@ public class IndividualObservationBatchUIHandler getPersistenceService().saveIndividualObservationBatch(entityToSave); } - getModel().fireBatchUpdated(row); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java index 2071658..f1cc3b1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java @@ -59,8 +59,7 @@ public class IndividualObservationBatchUIModel extends AbstractTuttiBatchUIModel public IndividualObservationBatchUIModel(EditCatchesUIModel catchesUIModel, List<Caracteristic> defaultCaracteristic) { - super(catchesUIModel, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED); + super(catchesUIModel); this.defaultCaracteristic = defaultCaracteristic == null ? Lists.<Caracteristic>newArrayList() : Lists.newArrayList(defaultCaracteristic); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index 9ef577f..9cc4d87 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -390,7 +390,6 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler getPersistenceService().saveMarineLitterBatch(entityToSave); } - getModel().fireBatchUpdated(row); } public void removeFromMarineLitterCategoriesUsed(MarineLitterBatchRowModel row) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java index 49661d6..19ae974 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java @@ -52,8 +52,7 @@ public class MarineLitterBatchUIModel extends AbstractTuttiBatchUIModel<MarineLi public MarineLitterBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, - EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED); + EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); } public ComputableData<Float> getMarineLitterTotalComputedOrNotWeight() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 3a52a5f..f7390ef 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -1296,7 +1296,6 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec frequency); row.setFrequency(frequencyRows); - getModel().fireBatchUpdated(row); } protected void loadBatchRow(SpeciesBatchRowModel parentRow, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java index 3034291..b1c62b1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java @@ -170,8 +170,7 @@ public class SpeciesBatchUIModel extends AbstractTuttiBatchUIModel<SpeciesBatchR EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, - EditCatchesUIModel.PROPERTY_BATCH_UPDATED); + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); } public Float getSpeciesTotalComputedWeight() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1618131aeb6a1f5a9c6db0af1442fd0d7797c8c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 13 12:31:37 2015 +0100 fixes #6817: [TECHN] Ne pas bloquer l'application à l'ouverture même si certains fichiers temporaires ne peuvent être détruit --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index bccc1fc..9b9707b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -201,10 +201,16 @@ public class TuttiConfiguration extends ApplicationConfiguration { File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - if (tmpDirectory.isFile()) { - ApplicationIOUtil.deleteFile(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); - } else { - ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + try { + if (tmpDirectory.isFile()) { + ApplicationIOUtil.deleteFile(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } else { + ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't delete temporary directory, but still go forward...",e); + } } } ApplicationIOUtil.forceMkdir(tmpDirectory, t("tutti.io.mkDir.error", tmpDirectory)); @@ -223,9 +229,16 @@ public class TuttiConfiguration extends ApplicationConfiguration { File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - ApplicationIOUtil.deleteDirectory( - tmpDirectory, - t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + try { + ApplicationIOUtil.deleteDirectory( + tmpDirectory, + t("tutti.io.deleteTempDirectory.error", tmpDirectory)); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't delete temporary directory, but still go forward...",e); + } + } + } ApplicationIOUtil.forceMkdir( tmpDirectory, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm