branch support/3.13.x updated (1fad0f5 -> 74b1e88)
This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from 1fad0f5 use less memory for report new 74b1e88 refs 6809 la mise en modification des onglets n'est pas ok The 1 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 74b1e880526c9902dcf8b1969bf8f7c3bc4b4597 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: .../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(-) -- 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 74b1e880526c9902dcf8b1969bf8f7c3bc4b4597 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 8048e31..8252914 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 @@ -279,8 +279,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 e1a751c..c8a3b05 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 @@ -452,6 +452,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 c909e59..8001eae 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 @@ -1521,7 +1521,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent frequencyRows = BenthosFrequencyRowModel.fromEntity(weightUnit, frequency); row.setFrequency(frequencyRows); - getModel().fireBatchUpdated(row); } protected void loadBatchRow(BenthosBatchRowModel parentRow, 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 3d89b52..58065c6 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 @@ -764,6 +764,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 4bd5c3b..6ab9887 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 @@ -402,7 +402,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 97cc68c..6be83ba 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 @@ -1540,7 +1540,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>.
participants (1)
-
codelutin.com scm